Merge branch 'QA_4_3'

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>

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

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();
         });

libraries/DisplayResults.class.php

@@ -861,7 +861,7 @@ class PMA_DisplayResults
             . (! $showing_all ? 'all' : $GLOBALS['cfg']['MaxRows']) . '" />'
             . '<input type="hidden" name="goto" value="' . $this->__get('goto')
             . '" />'
-            . '<input type="checkbox" name="navig" class="showAllRows"'
+            . '<input type="checkbox" name="navig" id="navig" class="showAllRows"'
             . (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
             . '<label for="navig">' . __('Show all') . '</label>'
             . '</form>'

test/classes/PMA_DisplayResults_test.php

@@ -1619,7 +1619,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '<input type="hidden" name="pos" value="0" />'
                 . '<input type="hidden" name="session_max_rows" value="all" />'
                 . '<input type="hidden" name="goto" value="tbl_structure.php" />'
-                . '<input type="checkbox" name="navig" class="showAllRows" value="all" />'
+                . '<input type="checkbox" name="navig" id="navig" class="showAllRows" value="all" />'
                 . '<label for="navig">Show all</label></form></td>'
             )
         );