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

Fix previous URI modification

Browse Source
This commit is contained in:
Michal Čihař
2005-10-18 19:57:29 +00:00
parent 2a9f434d87
commit c2c7e8b6b0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/common.lib.php
View File

@@ -1210,8 +1210,9 @@ if ($is_minimum_common == FALSE) {
if (!empty($url['port']) && (($url['scheme'] == 'http' && $url['port'] != 80) || ($url['scheme'] == 'https' && $url['port'] != 443))) { if (!empty($url['port']) && (($url['scheme'] == 'http' && $url['port'] != 80) || ($url['scheme'] == 'https' && $url['port'] != 443))) {
$cfg['PmaAbsoluteUri'] .= ':' . $url['port']; $cfg['PmaAbsoluteUri'] .= ':' . $url['port'];
} }
// And finally path, without script name // And finally path, without script name, the 'a' is there not to
$path = dirname($url['path']); // strip our directory, when path is only /pmadir/ without filename
$path = dirname($url['path'] . 'a');
// To work correctly within transformations overview: // To work correctly within transformations overview:
if (defined('PMA_PATH_TO_BASEDIR') && PMA_PATH_TO_BASEDIR == '../../') { if (defined('PMA_PATH_TO_BASEDIR') && PMA_PATH_TO_BASEDIR == '../../') {
$path = dirname(dirname($path)); $path = dirname(dirname($path));