diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2014-11-17 23:15:47 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-17 23:15:47 +0100 |
| commit | db3bffa284012aec4f96c851c413e435080fed02 (patch) | |
| tree | d6fa34ee7f90338ef301c90b5b4a712c53354383 /inc | |
| parent | d0287608b6d34f36caafbf699d44337052a0fe3d (diff) | |
| parent | ca6c0de38015e805acf432925059dbb26241bad3 (diff) | |
| download | wallabag-db3bffa284012aec4f96c851c413e435080fed02.tar.gz wallabag-db3bffa284012aec4f96c851c413e435080fed02.tar.zst wallabag-db3bffa284012aec4f96c851c413e435080fed02.zip | |
Merge pull request #937 from jsit/favicons
Moving favicons to new _global theme dir and adjusting <link> tags
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/poche/Template.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Template.class.php b/inc/poche/Template.class.php index b686f2ec..20e9c54a 100644 --- a/inc/poche/Template.class.php +++ b/inc/poche/Template.class.php | |||
| @@ -181,7 +181,7 @@ class Template extends Twig_Environment | |||
| 181 | while (($theme = readdir($handle)) !== false) { | 181 | while (($theme = readdir($handle)) !== false) { |
| 182 | # Themes are stored in a directory, so all directory names are themes | 182 | # Themes are stored in a directory, so all directory names are themes |
| 183 | # @todo move theme installation data to database | 183 | # @todo move theme installation data to database |
| 184 | if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..'))) { | 184 | if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..', '_global'))) { |
| 185 | continue; | 185 | continue; |
| 186 | } | 186 | } |
| 187 | 187 | ||
| @@ -232,4 +232,4 @@ class Template extends Twig_Environment | |||
| 232 | Tools::emptyCache(); | 232 | Tools::emptyCache(); |
| 233 | Tools::redirect('?view=config'); | 233 | Tools::redirect('?view=config'); |
| 234 | } | 234 | } |
| 235 | } \ No newline at end of file | 235 | } |