From 1ed62c3fcaf6445d3fbbf0d8e8bb188ad11773b7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 8 Nov 2014 06:46:25 -0500 Subject: [PATCH] bug Incorrect text/icon display in Tracking report Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/tbl_tracking.lib.php | 2 +- test/libraries/PMA_tbl_tracking_test.php | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59e8fdc223..32bf72e480 100644 --- 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 index 95d050658d..5195325bb2 100644 --- 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 index d5ab410906..4c0a260ae5 100644 --- a/test/libraries/PMA_tbl_tracking_test.php +++ b/test/libraries/PMA_tbl_tracking_test.php @@ -47,7 +47,6 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase $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;