From 15f887a979a1a6323b9a7d50f0462c63f489e954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 17 Aug 2011 13:32:27 +0200
Subject: [PATCH 1/3] Avoid loading themes from non directories, . and ..

---
 libraries/Theme_Manager.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 4ca8517da8..31163d1f47 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];

From 1b5461dc75db35efdb69e8a7fbdccb6a6e8e9e34 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Sep 2011 12:42:55 -0400
Subject: [PATCH 2/3] 3.4.6-dev

---
 ChangeLog                  | 2 ++
 Documentation.html         | 4 ++--
 README                     | 2 +-
 libraries/Config.class.php | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20e1751485..167760d9d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+3.4.6.0 (not yet released)
+
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
 - bug #3313235 [interface] Error div misplaced
diff --git a/Documentation.html b/Documentation.html
index 1e11f8d6e3..844dd7d345 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.5-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.6-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.5-dev
+        3.4.6-dev
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 9c627c5773..4c822292c3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 3.4.5-dev
+Version 3.4.6-dev
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index f76d545acc..4cc23154b8 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.5-dev');
+        $this->set('PMA_VERSION', '3.4.6-dev');
         /**
          * @deprecated
          */

From 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 4 Sep 2011 08:26:21 -0400
Subject: [PATCH 3/3] Missing UserprefsDeveloperTab doc

---
 Documentation.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation.html b/Documentation.html
index 844dd7d345..1217c2d6b8 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2163,6 +2163,10 @@ setfacl -d -m "g:www-data:rwx" tmp
         that users can't set through user preferences. For possible values, refer
         to <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
 
+    <dt id="cfg_UserprefsDeveloperTab">$cfg['UserprefsDeveloperTab'] boolean</dt>
+    <dd>Activates in the user preferences a tab containing options for 
+        developers of phpMyAdmin.</dd>
+
     <dt id="cfg_TitleTable">$cfg['TitleTable'] string</dt>
     <dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
     <dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>