From 4cfa667b97e89bd6ed72f3b198c99e26cb2fec24 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 1 Mar 2010 18:08:29 +0000
Subject: [PATCH] bug #2042032 Cannot detect PmaAbsoluteUri correctly on
 Windows

---
 ChangeLog                  | 1 +
 libraries/Config.class.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6d9e4daa9..0cfc75e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2948492 [interface] Slide effect masks some fields on search page
 - bug #2959746 [interface] Unknown table status: TABLE_TYPE 
 - bug #2953050 [export] export VIEW as SQL includes INSERT statement 
+- bug #2942032 [core] Cannot detect PmaAbsoluteUri correctly on Windows 
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 722e4249a..700de97a4 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -644,6 +644,7 @@ class PMA_Config
             // Backslashes returned by Windows have to be changed.
             // Only replace backslashes by forward slashes if on Windows,
             // as the backslash could be valid on a non-Windows system.
+            $this->checkWebServerOs();
             if ($this->get('PMA_IS_WINDOWS') == 1) {
                 $path = str_replace("\\", "/", dirname($url['path'] . 'a'));
             } else {