aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy <jeremy.benoist@gmail.com>2015-03-01 20:25:43 +0100
committerJeremy <jeremy.benoist@gmail.com>2015-03-01 20:25:43 +0100
commit3e30422cdae3cc45f44c3039c2d38b99121dd9e9 (patch)
treea15611f10d09749e82011e0d51532af3de8cfabd
parent495aecfe7417918c45d8ea32b1ee8903018449cd (diff)
downloadwallabag-3e30422cdae3cc45f44c3039c2d38b99121dd9e9.tar.gz
wallabag-3e30422cdae3cc45f44c3039c2d38b99121dd9e9.tar.zst
wallabag-3e30422cdae3cc45f44c3039c2d38b99121dd9e9.zip
Only one pattern for LiipTheme
Others patterns aren't required (but I think it's still important to have them around)
-rw-r--r--app/config/config.yml12
-rw-r--r--src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php1
2 files changed, 6 insertions, 7 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index b751c0bb..367aa276 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -136,11 +136,11 @@ liip_theme:
136 autodetect_theme: wallabag_core.helper.detect_active_theme 136 autodetect_theme: wallabag_core.helper.detect_active_theme
137 137
138 path_patterns: 138 path_patterns:
139 app_resource: 139 # app_resource:
140 - %%app_path%%/views/themes/%%current_theme%%/%%template%% 140 # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
141 - %%app_path%%/views/%%template%% 141 # - %%app_path%%/views/%%template%%
142 bundle_resource: 142 bundle_resource:
143 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 143 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
144 bundle_resource_dir: 144 # bundle_resource_dir:
145 - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% 145 # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
146 - %%dir%%/views/%%bundle_name%%/%%override_path%% 146 # - %%dir%%/views/%%bundle_name%%/%%override_path%%
diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
index 2c742e6a..446629db 100644
--- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
+++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php
@@ -12,7 +12,6 @@ use Wallabag\CoreBundle\Entity\User;
12 * 12 *
13 * If no user where logged in, it will returne the default theme 13 * If no user where logged in, it will returne the default theme
14 */ 14 */
15
16class DetectActiveTheme implements DeviceDetectionInterface 15class DetectActiveTheme implements DeviceDetectionInterface
17{ 16{
18 protected $securityContext; 17 protected $securityContext;