bug #2042032 Cannot detect PmaAbsoluteUri correctly on Windows

This commit is contained in:
Marc Delisle
2010-03-01 18:08:29 +00:00
parent 8e17cb01d5
commit 4cfa667b97
2 changed files with 2 additions and 0 deletions

View File

@@ -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 #2948492 [interface] Slide effect masks some fields on search page
- bug #2959746 [interface] Unknown table status: TABLE_TYPE - bug #2959746 [interface] Unknown table status: TABLE_TYPE
- bug #2953050 [export] export VIEW as SQL includes INSERT statement - 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) 3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields, + rfe #2308632 [edit] Use hex for (var)binary fields,

View File

@@ -644,6 +644,7 @@ class PMA_Config
// Backslashes returned by Windows have to be changed. // Backslashes returned by Windows have to be changed.
// Only replace backslashes by forward slashes if on Windows, // Only replace backslashes by forward slashes if on Windows,
// as the backslash could be valid on a non-Windows system. // as the backslash could be valid on a non-Windows system.
$this->checkWebServerOs();
if ($this->get('PMA_IS_WINDOWS') == 1) { if ($this->get('PMA_IS_WINDOWS') == 1) {
$path = str_replace("\\", "/", dirname($url['path'] . 'a')); $path = str_replace("\\", "/", dirname($url['path'] . 'a'));
} else { } else {