Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jan 2, 2020 · eb557be · eb557be
2 parents c45c786 + 637ec3d
commit eb557be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #15725 Fixed error 500 when exporting - set time limit when $cfg['ExecTimeLimit'] used a string and not an int value
 - issue #15726 Fixed double delete icons on enum editor
 - issue #15717 Fixed warning popup not dissapearing on table stucture when using actions without any column selection
+- issue #15693 Fixed focus of active tab is lost by clicking refresh option on browse tab
 
 5.0.0 (2019-12-26)
 - issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM

diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -937,7 +937,7 @@ public static function getMessage(
                 && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same
                 && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
             ) {
-                $refresh_link = Url::getFromRoute('/import', $url_params);
+                $refresh_link = Url::getFromRoute('/sql', $url_params);
                 $refresh_link = ' [&nbsp;'
                     . self::linkOrButton($refresh_link, __('Refresh')) . ']';
             } else {