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

bug #1398931, incorrect detection of PmaAbsoluteUri in vhost situations

Browse Source
This commit is contained in:
Marc Delisle
2006-01-07 13:25:07 +00:00
parent 0ebee3fbc8
commit 32a39388f1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -12,6 +12,8 @@ $Source$
PMA_linkOrButton link is part of the link, thanks to Ryan Schmidt PMA_linkOrButton link is part of the link, thanks to Ryan Schmidt
* server_privileges.php: bug #1398018, Safari fieldset float issue in * server_privileges.php: bug #1398018, Safari fieldset float issue in
privileges screens, thanks to Ryan Schmidt privileges screens, thanks to Ryan Schmidt
* libraries/Config.class.php: bug #1398931, incorrect detection of
PmaAbsoluteUri in vhost situations, thanks to Ryan Schmidt
2006-01-06 Marc Delisle <lem9@users.sourceforge.net> 2006-01-06 Marc Delisle <lem9@users.sourceforge.net>
* db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all * db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all

6
libraries/Config.class.php
View File

@@ -570,7 +570,11 @@ class PMA_Config
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));
} }
$pma_absolute_uri .= $path . '/'; // in vhost situations, there could be already an ending slash
if (substr($path, -1) != '/') {
$path .= '/';
}
$pma_absolute_uri .= $path;
// We used to display a warning if PmaAbsoluteUri wasn't set, but now // We used to display a warning if PmaAbsoluteUri wasn't set, but now
// the autodetect code works well enough that we don't display the // the autodetect code works well enough that we don't display the