Merge branch 'master' into talmdal_dev

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;
   }