From: Jeremy Date: Sun, 1 Mar 2015 19:25:43 +0000 (+0100) Subject: Only one pattern for LiipTheme X-Git-Tag: 2.0.0-alpha.0~75^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=3e30422cdae3cc45f44c3039c2d38b99121dd9e9;p=github%2Fwallabag%2Fwallabag.git Only one pattern for LiipTheme Others patterns aren't required (but I think it's still important to have them around) --- 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: autodetect_theme: wallabag_core.helper.detect_active_theme path_patterns: - app_resource: - - %%app_path%%/views/themes/%%current_theme%%/%%template%% - - %%app_path%%/views/%%template%% + # app_resource: + # - %%app_path%%/views/themes/%%current_theme%%/%%template%% + # - %%app_path%%/views/%%template%% bundle_resource: - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% - bundle_resource_dir: - - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% - - %%dir%%/views/%%bundle_name%%/%%override_path%% + # bundle_resource_dir: + # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%% + # - %%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; * * If no user where logged in, it will returne the default theme */ - class DetectActiveTheme implements DeviceDetectionInterface { protected $securityContext;