Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-02-10 19:11:59 +01:00
commit ee629c9544
2 changed files with 11 additions and 0 deletions

View File

@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
- bug #4237 HTTP Referer disclosure in SQL links
4.1.8.0 (not yet released)
- bug #4276 Login loop on session expiry
4.1.7.0 (2014-02-09)
- bug #4245 initial Browse query does not match sorting order

View File

@ -33,10 +33,20 @@ foreach ($drops as $each_drop) {
}
unset($drops, $each_drop);
/*
* Black list of all scripts to which front-end must submit data.
* Such scripts must not be loaded on home page.
*
*/
$target_blacklist = array (
'import.php', 'export.php'
);
// If we have a valid target, let's load that script instead
if (! empty($_REQUEST['target'])
&& is_string($_REQUEST['target'])
&& ! preg_match('/^index/', $_REQUEST['target'])
&& ! in_array($_REQUEST['target'], $target_blacklist ) // Check if target is not in blacklist.
&& in_array($_REQUEST['target'], $goto_whitelist)
) {
include $_REQUEST['target'];