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

bug Handle the situation where PHP_SELF is not set

Browse Source
This commit is contained in:
Marc Delisle 2013-08-30 08:25:48 -04:00
parent 0425d898bf
commit 4a609d5b2e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
4.0.7.0 (not yet released)
- bug #3993 Sorting in database overview with statistics doesn't work
- bug Handle the situation where PHP_SELF is not set
4.0.6.0 (not yet released)
- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)

8
libraries/Config.class.php
View File

@ -1271,7 +1271,13 @@ class PMA_Config
// And finally the path could be already set from REQUEST_URI
if (empty($url['path'])) {
$path = parse_url($GLOBALS['PMA_PHP_SELF']);
// we got a case with nginx + php-fpm where PHP_SELF
// was not set, so PMA_PHP_SELF was not set as well
if (isset($GLOBALS['PMA_PHP_SELF'])) {
$path = parse_url($GLOBALS['PMA_PHP_SELF']);
} else {
$path = parse_url(PMA_getenv('REQUEST_URI'));
}
$url['path'] = $path['path'];
}
}