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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-04 21:05:30 +02:00
commit cbc45bc575
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -59,7 +59,7 @@ if (! strlen($GLOBALS['db'])) {
$url_query = PMA_generate_common_url($_GET);
if (isset($_REQUEST['target']) && is_string($_REQUEST['target']) && !empty($_REQUEST['target']) && in_array($_REQUEST['target'], $goto_whitelist)) {
if (! empty($_REQUEST['target']) && is_string($_REQUEST['target']) && in_array($_REQUEST['target'], $goto_whitelist)) {
$main_target = $_REQUEST['target'];
}

8
libraries/auth/cookie.auth.lib.php
View File

@ -11,6 +11,14 @@ if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Remember where to redirect the user
* in case of an expired session.
*/
if (! empty($_REQUEST['target'])) {
$GLOBALS['target'] = $_REQUEST['target'];
}
/**
* Swekey authentication functions.
*/