Merge pull request #1081 from wallabag/dev1.9

Version 1.9.0

1 files changed, 3 insertions, 3 deletions

diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php
index b686f2ec..4d0bfdbb 100644
--- a/inc/poche/Template.class.php
+++ b/inc/poche/Template.class.php
@@ -24,7 +24,7 @@ class Template extends Twig_Environment
 
         $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
 
-        if ($themeDirectory === false) {
+        if ($themeDirectory === false || !is_dir(THEME . '/' . $themeDirectory)) {
             $themeDirectory = DEFAULT_THEME;
         }
 
@@ -181,7 +181,7 @@ class Template extends Twig_Environment
         while (($theme = readdir($handle)) !== false) {
             # Themes are stored in a directory, so all directory names are themes
             # @todo move theme installation data to database
-            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) {
+            if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..', '_global'))) {
                 continue;
             }
 
@@ -232,4 +232,4 @@ class Template extends Twig_Environment
         Tools::emptyCache();
         Tools::redirect('?view=config');
     }
-}
\ No newline at end of file
+}