From 1f5a19b69cc303728417c13dbb23f7fd9fc89a97 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 3 Feb 2010 15:32:37 +0000
Subject: [PATCH] bug #2944069 [config] Extraneus dot from dirname() when
 installed in root, thanks to ayanamist

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

diff --git a/ChangeLog b/ChangeLog
index 1a7c80577..ecdea4c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,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, 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f12dfb8c8..b3fbcc3da 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -676,6 +676,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 .= '/';