aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-03-24 01:36:28 +0000
committerpatdenice <patdenice@piwigo.org>2010-03-24 01:36:28 +0000
commit2ad08fa8c176581c7ab17b31af950adb8b4f3edf (patch)
tree03206e8fa44a76b3c2e8be687a3b25bea74cf102 /include
parent6c31dd43268dc5cccc91968415cf03350a517c92 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/config_default.inc.php3
-rw-r--r--include/functions.inc.php7
2 files changed, 6 insertions, 4 deletions
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?