[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4-34-g15f887a

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  15f887a979a1a6323b9a7d50f0462c63f489e954 (commit)
      from  7ed2f6f3624395193a8264183c8462e85c12b52c (commit)


- Log -----------------------------------------------------------------
commit 15f887a979a1a6323b9a7d50f0462c63f489e954
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 4ca8517..31163d1 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -231,6 +231,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)) {
                     // this does nothing!
                     //$this->themes[$PMA_Theme] = $this->themes[$PMA_Theme];


hooks/post-receive
-- 
phpMyAdmin