From a4ec378179f33a98e9d07e21e36cb1523e10094c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sun, 9 Jul 2017 10:49:16 +0200
Subject: [PATCH] Move spacing around buttons to Util::getMessage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We really do not want to add spacing around all buttons, just the ones
in the SQL message.

Fixes #13445

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                           |  1 +
 libraries/Util.php                  | 32 ++++++++++++-------------
 test/classes/DisplayResultsTest.php | 36 ++++++++++++++---------------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e54fa938ea..755c16ff6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.7.3 (not yet released)
 - issue #13447 Large multi-line query removes Export operation and blanks query box options
+- issue #13445 Fixed rendering of query results
 
 4.7.2 (2017-06-29)
 - issue #13314 Make theme selection keep current server
diff --git a/libraries/Util.php b/libraries/Util.php
index 57715edeff..d1be48b662 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -1061,18 +1061,18 @@ class Util
                 $explain_params = $url_params;
                 if ($is_select) {
                     $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
-                    $explain_link = ' ['
+                    $explain_link = ' [&nbsp;'
                         . self::linkOrButton(
                             'import.php' . URL::getCommon($explain_params),
                             __('Explain SQL')
-                        ) . ']';
+                        ) . '&nbsp;]';
                 } elseif (preg_match(
                     '@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i',
                     $sql_query
                 )) {
                     $explain_params['sql_query']
                         = mb_substr($sql_query, 8);
-                    $explain_link = ' ['
+                    $explain_link = ' [&nbsp;'
                         . self::linkOrButton(
                             'import.php' . URL::getCommon($explain_params),
                             __('Skip Explain SQL')
@@ -1088,7 +1088,7 @@ class Util
                             true,
                             false,
                             '_blank'
-                        ) . ']';
+                        ) . '&nbsp;]';
                 }
             } //show explain
 
@@ -1101,9 +1101,9 @@ class Util
                 && empty($GLOBALS['show_as_php'])
             ) {
                 $edit_link .= URL::getCommon($url_params) . '#querybox';
-                $edit_link = ' ['
+                $edit_link = ' [&nbsp;'
                     . self::linkOrButton($edit_link, __('Edit'))
-                    . ']';
+                    . '&nbsp;]';
             } else {
                 $edit_link = '';
             }
@@ -1113,7 +1113,7 @@ class Util
             if (! empty($cfg['SQLQuery']['ShowAsPHP']) && ! $query_too_big) {
 
                 if (! empty($GLOBALS['show_as_php'])) {
-                    $php_link = ' ['
+                    $php_link = ' [&nbsp;'
                         . self::linkOrButton(
                             'import.php' . URL::getCommon($url_params),
                             __('Without PHP code'),
@@ -1123,9 +1123,9 @@ class Util
                             '',
                             true
                         )
-                        . ']';
+                        . '&nbsp;]';
 
-                    $php_link .= ' ['
+                    $php_link .= ' [&nbsp;'
                         . self::linkOrButton(
                             'import.php' . URL::getCommon($url_params),
                             __('Submit query'),
@@ -1135,17 +1135,17 @@ class Util
                             '',
                             true
                         )
-                        . ']';
+                        . '&nbsp;]';
                 } else {
                     $php_params = $url_params;
                     $php_params['show_as_php'] = 1;
                     $_message = __('Create PHP code');
-                    $php_link = ' ['
+                    $php_link = ' [&nbsp;'
                         . self::linkOrButton(
                             'import.php' . URL::getCommon($php_params),
                             $_message
                         )
-                        . ']';
+                        . '&nbsp;]';
                 }
             } else {
                 $php_link = '';
@@ -1157,8 +1157,8 @@ class Util
                 && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
             ) {
                 $refresh_link = 'import.php' . URL::getCommon($url_params);
-                $refresh_link = ' ['
-                    . self::linkOrButton($refresh_link, __('Refresh')) . ']';
+                $refresh_link = ' [&nbsp;'
+                    . self::linkOrButton($refresh_link, __('Refresh')) . '&nbsp;]';
             } else {
                 $refresh_link = '';
             } //refresh
@@ -1833,9 +1833,9 @@ class Util
             }
 
             // no whitespace within an <a> else Safari will make it part of the link
-            $ret = '&nbsp;<a href="' . $url . '" '
+            $ret = '<a href="' . $url . '" '
                 . implode(' ', $tag_params_strings) . '>'
-                . $message . $displayed_message . '</a>&nbsp;';
+                . $message . $displayed_message . '</a>';
         } else {
             // no spaces (line breaks) at all
             // or after the hidden fields
diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php
index 4e4066b676..61c857fe92 100644
--- a/test/classes/DisplayResultsTest.php
+++ b/test/classes/DisplayResultsTest.php
@@ -434,13 +434,13 @@ class DisplayResultsTest extends PMATestCase
                 '`customer`.`id` = 1',
                 '%60customer%60.%60id%60+%3D+1',
                 '<td class="klass edit_row_anchor center print_ignore"  >'
-                . '<span class="nowrap">&nbsp;'
+                . '<span class="nowrap">'
                 . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
                 . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
                 . 'sql_query=SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;'
                 . 'default_action=update"'
                 . ' ><span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>&nbsp;'
+                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>'
                 . '<input type="hidden" class="where_clause" value ="%60customer'
                 . '%60.%60id%60+%3D+1" /></span></td>'
             )
@@ -497,13 +497,13 @@ class DisplayResultsTest extends PMATestCase
                 '%60customer%60.%60id%60+%3D+1',
                 'klass',
                 '<td class="klass center print_ignore"  ><span class='
-                . '"nowrap">&nbsp;'
+                . '"nowrap">'
                 . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
                 . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
                 . 'sql_query=SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;'
                 . 'default_action=insert"'
                 . ' ><span class="nowrap"><img src="themes/dot.gif" title="Copy" '
-                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>&nbsp;'
+                . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>'
                 . '<input type="hidden" class="where_clause" value="%60customer%60'
                 . '.%60id%60+%3D+1" /></span></td>'
             )
@@ -560,7 +560,7 @@ class DisplayResultsTest extends PMATestCase
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1',
                 'klass',
-                '<td class="klass center print_ignore"  >&nbsp;'
+                '<td class="klass center print_ignore"  >'
                 . '<a href="sql.php?db=Data&amp;table=customer&amp;sql_query=DELETE'
                 . '+FROM+%60Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D'
                 . '+1&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php'
@@ -569,7 +569,7 @@ class DisplayResultsTest extends PMATestCase
                 . 'been%2Bdeleted%26goto%3Dtbl_structure.php" '
                 . 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
                 . 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
-                . 'Delete</span></a>&nbsp;'
+                . 'Delete</span></a>'
                 . '<div class="hide">DELETE FROM `Data`.`customer` WHERE '
                 . '`customer`.`id` = 1</div></td>'
             )
@@ -656,24 +656,24 @@ class DisplayResultsTest extends PMATestCase
                 . 'value="%60new%60.%60id%60+%3D+1"  /><input type="hidden" class='
                 . '"condition_array" value="{&quot;`new`.`id`&quot;:&quot;= 1&quot;'
                 . '}" />    </td><td class="edit_row_anchor center print_ignore"  ><span class='
-                . '"nowrap">&nbsp;'
+                . '"nowrap">'
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
                 . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
                 . 'sql_query=SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default'
                 . '_action=update" >'
                 . '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
-                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>&nbsp;'
+                . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>'
                 . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
                 . 'id%60+%3D+1" /></span></td><td class="center print_ignore"  ><span class'
-                . '="nowrap">&nbsp;'
+                . '="nowrap">'
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
                 . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
                 . 'SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_action='
                 . 'insert" ><span class'
                 . '="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
-                . 'class="icon ic_b_insrow" /> Copy</span></a>&nbsp;'
+                . 'class="icon ic_b_insrow" /> Copy</span></a>'
                 . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
-                . '%60+%3D+1" /></span></td><td class="center print_ignore"  >&nbsp;'
+                . '%60+%3D+1" /></span></td><td class="center print_ignore"  >'
                 . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
                 . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
                 . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3F'
@@ -682,7 +682,7 @@ class DisplayResultsTest extends PMATestCase
                 . 'deleted%26goto%3Dtbl_structure.php" '
                 . 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
                 . 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
-                . 'Delete</span></a>&nbsp;'
+                . 'Delete</span></a>'
                 . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.`id` = 1'
                 . '</div></td>'
             ),
@@ -723,7 +723,7 @@ class DisplayResultsTest extends PMATestCase
                 '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td class="center print_ignore"  >&nbsp;'
+                '<td class="center print_ignore"  >'
                 . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
                 . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
                 . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb'
@@ -732,23 +732,23 @@ class DisplayResultsTest extends PMATestCase
                 . '%26goto%3Dtbl_structure.php" class="delete'
                 . '_row requireConfirm"><span class="nowrap"><img src="themes/dot.gif" title='
                 . '"Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>'
-                . '&nbsp;<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
+                . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
                 . '`id` = 1</div></td><td class="center print_ignore"  ><span class="nowrap">'
-                . '&nbsp;<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
+                . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
                 . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_'
                 . 'query=SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_'
                 . 'action=insert" ><span '
                 . 'class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
-                . 'class="icon ic_b_insrow" /> Copy</span></a>&nbsp;'
+                . 'class="icon ic_b_insrow" /> Copy</span></a>'
                 . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
                 . '%60+%3D+1" /></span></td><td class="edit_row_anchor center print_ignore"  >'
-                . '<span class="nowrap">&nbsp;'
+                . '<span class="nowrap">'
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
                 . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
                 . 'SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_action='
                 . 'update" ><span class='
                 . '"nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class'
-                . '="icon ic_b_edit" /> Edit</span></a>&nbsp;'
+                . '="icon ic_b_edit" /> Edit</span></a>'
                 . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
                 . 'id%60+%3D+1" /></span></td><td  class="center print_ignore"><input type='
                 . '"checkbox" id="id_rows_to_delete0_right" name="rows_to_delete'