bug Incorrect text/icon display in Tracking report

Signed-off-by: Marc Delisle <marc@infomarc.info>
phpmyadmin · Nov 8, 2014 · 1ed62c3 · 1ed62c3
1 parent 2a58116
commit 1ed62c3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4574 Blank/white page when JavaScript disabled
 - bug #4577 Multi row actions cause full page reloads
 - bug       ReferenceError: targeurl is not defined
+- bug       Incorrect text/icon display in Tracking report
 
 4.2.11.0 (2014-10-31)
 - bug       ReferenceError: Table_onover is not defined

diff --git a/libraries/tbl_tracking.lib.php b/libraries/tbl_tracking.lib.php
@@ -364,7 +364,7 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
 
     // Prepare delete link content here
     $drop_image_or_text = '';
-    if (PMA_Util::showIcons('ActionsLinksMode')) {
+    if (PMA_Util::showIcons('ActionLinksMode')) {
         $drop_image_or_text .= PMA_Util::getImage(
             'b_drop.png', __('Delete tracking data row from report')
         );

diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
@@ -47,7 +47,6 @@ protected function setUp()
         $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['Server']['tracking'] = "tracking";
-        $GLOBALS['cfg']['ActionsLinksMode'] = 'ActionsLinksMode';
         $GLOBALS['cfg']['ActionLinksMode'] = 'ActionLinksMode';
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;