diff --git a/ChangeLog b/ChangeLog index 20b6c80f0c..821ffe9085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,7 +58,8 @@ phpMyAdmin - ChangeLog 4.2.12.0 (not yet released) - bug #4574 Blank/white page when JavaScript disabled - bug #4577 Multi row actions cause full page reloads -- bug ReferenceError: targeurl is not defined +- bug ReferenceError: targeturl 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/tracking.lib.php b/libraries/tracking.lib.php index ab9fc6b2ab..34d3fa4361 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -396,7 +396,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 c1b404e1c6..08d188ba7d 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;