bug #2944069 [config] Extraneus dot from dirname() when installed in root, thanks to ayanamist
This commit is contained in:
@@ -96,6 +96,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
||||
- bug #2938492 [display] information_schema sorting order
|
||||
- bug #2941101 [import] import timeout when table already created and
|
||||
several data lines
|
||||
- bug #2944069 [config] Extraneus dot from dirname() when installed in root, thanks to ayanamist
|
||||
|
||||
3.2.5.0 (2010-01-10)
|
||||
- patch #2903400 [bookmarks] Status of bookmark table,
|
||||
|
@@ -658,6 +658,11 @@ class PMA_Config
|
||||
$path = dirname(dirname($path));
|
||||
}
|
||||
}
|
||||
|
||||
// PHP's dirname function would have returned a dot when $path contains no slash
|
||||
if ($path == '.') {
|
||||
$path = '';
|
||||
}
|
||||
// in vhost situations, there could be already an ending slash
|
||||
if (substr($path, -1) != '/') {
|
||||
$path .= '/';
|
||||
|
Reference in New Issue
Block a user