From 32a39388f1d09b67415b2e32dd802ca7b53eadb0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 7 Jan 2006 13:25:07 +0000 Subject: [PATCH] bug #1398931, incorrect detection of PmaAbsoluteUri in vhost situations --- ChangeLog | 2 ++ libraries/Config.class.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1de37bd49..a9f25b689 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ $Source$ PMA_linkOrButton link is part of the link, thanks to Ryan Schmidt * server_privileges.php: bug #1398018, Safari fieldset float issue in 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 * db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ef96e2cce..853d676f9 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -570,7 +570,11 @@ class PMA_Config if (defined('PMA_PATH_TO_BASEDIR') && PMA_PATH_TO_BASEDIR == '../../') { $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 // the autodetect code works well enough that we don't display the