gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Hugues Peccatte 2014-11-08 15:27:33 +01:00
commit 458afb0391
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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

2
libraries/tracking.lib.php
View File

@ -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')
);

1
test/libraries/PMA_tbl_tracking_test.php
View File

@ -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;