summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/admin_themes.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-11-21 09:28:47 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-11-21 09:28:47 -0800
commit75998948fd38ed1dc6168a3b2dae76225a49364b (patch)
tree514ff36a54df6a56feda877fe1de3794edc0a1f9 /modules/gallery/controllers/admin_themes.php
parent48e5af8d739f69e5891d072fab98240641c2640c (diff)
parent4c5e2000f606d696a056fcfed231df5be8a42ada (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/admin_themes.php')
-rw-r--r--modules/gallery/controllers/admin_themes.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 23685c90..6991acd2 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -30,11 +30,13 @@ class Admin_Themes_Controller extends Admin_Controller {
private function _get_themes() {
$themes = array();
foreach (scandir(THEMEPATH) as $theme_name) {
- if ($theme_name[0] == ".") {
- continue;
- }
+ if (file_exists(THEMEPATH . "$theme_name/theme.info")) {
+ if ($theme_name[0] == ".") {
+ continue;
+ }
- $themes[$theme_name] = theme::get_info($theme_name);
+ $themes[$theme_name] = theme::get_info($theme_name);
+ }
}
return $themes;
}