diff --git a/ChangeLog b/ChangeLog index eb6bcbb0e3..4030646344 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.2.5.0 (not yet released) +- bug #4467 shell_exec() has been disabled for security reasons 4.2.4.0 (2014-06-20) - bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index d5f54bd21e..b1c6f24da2 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2039,9 +2039,9 @@ class PMA_DisplayResults foreach ($sort_expression_nodirection as $index => $clause) { if (strpos($clause, '.') !== false) { $fragments = explode('.', $clause); - $clause2 = $fragments[0] . "." . str_replace('`', ``, $fragments[1]); + $clause2 = $fragments[0] . "." . str_replace('`', '', $fragments[1]); } else { - $clause2 = $sort_tbl . str_replace('`', ``, $clause); + $clause2 = $sort_tbl . str_replace('`', '', $clause); } if ($clause2 === $sort_tbl . $name_to_use_in_sort) { $index_in_expression = $index;