diff --git a/ChangeLog b/ChangeLog index 2ff4856fb5..ef6484941a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ phpMyAdmin - ChangeLog + rfe #1564 Improve action message on Tracking page 4.3.1.0 (not yet released) +- bug #4609 'Show all' checkbox label is not clickable +- bug #4610 JS error reporting: Hash fragment is reset 4.3.0.0 (not yet released) + rfe #1502 Smart sorting for int keys diff --git a/js/error_report.js b/js/error_report.js index 3d00b39466..248397427e 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -151,7 +151,9 @@ var ErrorReport = { * * @return void */ - _removeErrorNotification: function () { + _removeErrorNotification: function (e) { + // don't remove the hash fragment by navigating to # + e.preventDefault(); $("#error_notification").fadeOut(function () { $(this).remove(); }); diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 49aa2fd6bb..fb3b9148a0 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -861,7 +861,7 @@ class PMA_DisplayResults . (! $showing_all ? 'all' : $GLOBALS['cfg']['MaxRows']) . '" />' . '' - . '' . '' . '' diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index f690f7345b..c169090065 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1619,7 +1619,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase . '' . '' . '' - . '' + . '' . '' ) );