Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-10-23 18:59:19 +02:00
commit ce2cad3ef5
2 changed files with 2 additions and 1 deletions

View File

@ -61,6 +61,7 @@ phpMyAdmin - ChangeLog
- bug #4259 reCaptcha sound session expired problem
- bug #4557 PHP fatal error, undefined function __()
- bug #4568 Date displayed incorrectly when charting a timeline
- bug #4571 Database Privileges link does not work
4.2.10.1 (not yet released)
- bug #4562 [security] XSS in debug SQL output

View File

@ -299,7 +299,7 @@ if ($GLOBALS['is_ajax_request']
* Displays the links
*/
if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
$_REQUEST['db'] = $_REQUEST['checkprivsdb'];
$GLOBALS['db'] = $_REQUEST['db'] = $_REQUEST['checkprivsdb'];
$url_query .= '&goto=db_operations.php';