aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-11-24 22:56:10 +0100
committerThomas Citharel <tcit@tcit.fr>2014-11-24 22:56:10 +0100
commitb9c026ce32abed7295d2775640edc0ef89017723 (patch)
tree3492511dde4bb1b3ad5e95ef918a68d5f5418d64 /inc/poche
parent485d57972ee3c3219652454ff6d7d82a3602bd34 (diff)
parent85c5a1ff8d919d3d36a8125c9bbd0d9220025729 (diff)
downloadwallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.gz
wallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.zst
wallabag-b9c026ce32abed7295d2775640edc0ef89017723.zip
Merge branch 'remove-courgette' into dev
Conflicts: themes/courgette/_view.twig
Diffstat (limited to 'inc/poche')
-rw-r--r--inc/poche/Template.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php
index 20e9c54a..4d0bfdbb 100644
--- a/inc/poche/Template.class.php
+++ b/inc/poche/Template.class.php
@@ -24,7 +24,7 @@ class Template extends Twig_Environment
24 24
25 $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme')); 25 $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
26 26
27 if ($themeDirectory === false) { 27 if ($themeDirectory === false || !is_dir(THEME . '/' . $themeDirectory)) {
28 $themeDirectory = DEFAULT_THEME; 28 $themeDirectory = DEFAULT_THEME;
29 } 29 }
30 30