Merge pull request ezsystems#222 from ezsystems/impl_EZP-23866_moveLe…

…gacyMode EZP-23866: Move legacy_mode setting to LegacyBundle
ezpublishlegacy · Jan 15, 2015 · f7923ea · f7923ea
2 parents 66df14e + ce5dc2b
commit f7923ea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/ezpublish/config/config.yml b/ezpublish/config/config.yml
@@ -50,10 +50,6 @@ assetic:
         #yui_css:
         #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 
-ez_publish_legacy:
-    enabled: true
-    root_dir: %kernel.root_dir%/../ezpublish_legacy
-
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"

diff --git a/ezpublish/config/ezpublish.yml.example b/ezpublish/config/ezpublish.yml.example
@@ -94,6 +94,10 @@ ezpublish:
                     filters:
                         - {name: geometry/scalewidthdownonly, params: [300]}
                         - {name: geometry/crop, params: [200, 200, 0, 0]}
+
+ez_publish_legacy:
+    enabled: true
+    system:
         ezdemo_site_admin:
-            # Use legacy mode to use the admin interface since everything needs to run via the legacy kernel
+            # Use legacy mode to use the admin interface since everything needs to be run via the legacy kernel
             legacy_mode: true
diff --git a/ezpublish/config/ezpublish_behat.yml b/ezpublish/config/ezpublish_behat.yml
@@ -30,6 +30,9 @@ ezpublish:
             repository: behat
             languages: [eng-GB]
             var_dir: var/behat_site
+
+ez_publish_legacy:
+    system:
         behat_site:
             legacy_mode: false
         behat_site_admin: