Merge branch 'QA_4_7'

ChangeLog

@@ -89,6 +89,8 @@ phpMyAdmin - ChangeLog
 - issue #13000 Align NULL values according to the column alignment
 - issue #13021 Show phpMyAdmin errors even with error_reporting set to 0
 - issue #13020 Removed warning about client and server versions mismatch
+- issue        Hide comments on table Structure tab when no comment is set
+- issue        Fixed submission of error reports
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

libraries/Util.php

@@ -4779,7 +4779,6 @@ class Util
         }
         if ($header) {
             curl_setopt($curl_handle, CURLOPT_HTTPHEADER, array($header));
-            curl_setopt($curl_handle, CURLOPT_HEADER, true);
         }
 
         if ($method == "POST") {

libraries/error_report.lib.php

@@ -178,8 +178,13 @@ function PMA_sanitizeUrl($url)
  */
 function PMA_sendErrorReport($report)
 {
-    $data_string = json_encode($report);
-    $response = PMA\libraries\Util::httpRequest(SUBMISSION_URL, "POST", false, $data_string, "Content-Type: application/json\r\n");
+    $response = PMA\libraries\Util::httpRequest(
+        SUBMISSION_URL,
+        "POST",
+        false,
+        json_encode($report),
+        "Content-Type: application/json"
+    );
     return $response;
 }
 

templates/table/structure/display_table_stats.phtml

@@ -1,9 +1,11 @@
 <div id="tablestatistics">
     <fieldset>
         <legend><?= __('Information'); ?></legend>
-        <p> <strong> <?= __('Table comments:') ?> </strong>
-            <?= isset($showtable['TABLE_COMMENT']) ? htmlspecialchars($showtable['TABLE_COMMENT']) : '';?>
-        </p>
+        <?php if($showtable['TABLE_COMMENT'] !== '') { ?>
+            <p> <strong> <?= __('Table comments:') ?> </strong>
+                <?= htmlspecialchars($showtable['TABLE_COMMENT']) ;?>
+            </p>
+        <?php } ?>
         <a id="showusage"></a>
 
         <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>