[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15445-g82c6f95

[Michal Čihař]

The branch, master has been updated
       via  82c6f950eb99b3fa69f73de816022e9b5d350ce6 (commit)
      from  4e94e3e35d3224c0672581c680edcbfea421ac9d (commit)


- Log -----------------------------------------------------------------
commit 82c6f950eb99b3fa69f73de816022e9b5d350ce6
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Aug 17 13:32:27 2011 +0200

    Avoid loading themes from non directories, . and ..

-----------------------------------------------------------------------

Summary of changes:
 libraries/Theme_Manager.class.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index c430974..840e611 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -235,6 +235,10 @@ class PMA_Theme_Manager
         if ($handleThemes = opendir($this->getThemesPath())) {
             // check for themes directory
             while (false !== ($PMA_Theme = readdir($handleThemes))) {
+                // Skip non dirs, . and ..
+                if ($PMA_Theme == '.' || $PMA_Theme == '..' || ! is_dir($this->getThemesPath() . '/' . $PMA_Theme)) {
+                    continue;
+                }
                 if (array_key_exists($PMA_Theme, $this->themes)) {
                     continue;
                 }


hooks/post-receive
-- 
phpMyAdmin