From 2ad08fa8c176581c7ab17b31af950adb8b4f3edf Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Wed, 24 Mar 2010 01:36:28 +0000
Subject: feature 1502: bug corrected on guest setting page. Remove
 $conf['default_theme'] from config file (useless). Check if theme is still
 installed in pwg_get_themes.

git-svn-id: http://piwigo.org/svn/trunk@5306 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/profile_content.tpl | 2 +-
 include/config_default.inc.php                    | 3 ---
 include/functions.inc.php                         | 7 ++++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index fd8841a4e..995fa734a 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -59,7 +59,7 @@
         <span class="property">
           <label for="template">{'Interface theme'|@translate}</label>
         </span>
-        {html_options id=template name=template options=$template_options selected=$template_selection}
+        {html_options id=template name=theme options=$template_options selected=$template_selection}
       </li>
       <li>
         <span class="property">
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 0850723f6..0ca54bc7e 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -335,9 +335,6 @@ $conf['insensitive_case_logon'] = false;
 // 'filename'
 $conf['uniqueness_mode'] = 'md5sum';
 
-// Define default theme for your gallery
-$conf['default_theme'] = 'Sylvia';
-
 // +-----------------------------------------------------------------------+
 // |                               metadata                                |
 // +-----------------------------------------------------------------------+
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 0cd0659c4..8a34990fa 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -686,6 +686,8 @@ function url_is_remote($url)
  */
 function get_pwg_themes()
 {
+  global $conf;
+
   $themes = array();
 
   $query = '
@@ -698,7 +700,10 @@ SELECT
   $result = pwg_query($query);
   while ($row = pwg_db_fetch_assoc($result))
   {
-    $themes[ $row['id'] ] = $row['name'];
+    if (file_exists($conf['themes_dir'].'/'.$row['name'].'/'.'themeconf.inc.php'))
+    {
+      $themes[ $row['id'] ] = $row['name'];
+    }
   }
 
   // plugins want remove some themes based on user status maybe?
-- 
cgit v1.2.3