Updated AssetsHelper

BeSimple · Mar 30, 2011 · 8c49408 · 8c49408
1 parent 619bc17
commit 8c49408
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Resources/config/packing_minify.xml b/Resources/config/packing_minify.xml
@@ -47,8 +47,9 @@
             <tag name="templating.helper" alias="assets" />
             <argument type="service" id="request" strict="false" />
             <argument type="service" id="templating.helper.router" />
-            <argument>%templating.assets.base_urls%</argument>
-            <argument>%templating.assets.version%</argument>
+            <argument type="collection" /> <!-- assets base URLs -->
+            <argument /> <!-- assets version -->
+            <argument type="collection" /> <!-- packages -->
         </service>
 
         <service id="packing_minify" class="%packing_minify%">

diff --git a/Templating/Helper/AssetsHelper.php b/Templating/Helper/AssetsHelper.php
@@ -19,9 +19,9 @@ class AssetsHelper extends BaseAssetsHelper
      * @param string|array $baseURLs The domain URL or an array of domain URLs
      * @param string       $version  The version
      */
-    public function __construct(Request $request, RouterHelper $routerHelper, $baseURLs = array(), $version = null)
+    public function __construct(Request $request, RouterHelper $routerHelper, $baseURLs = array(), $version = null, $packages = array())
     {
-        parent::__construct($request, $baseURLs, $version);
+        parent::__construct($request, $baseURLs, $version, $packages);
 
         if (preg_match('#'.preg_quote($request->server->get('SCRIPT_NAME')).'#', $request->server->get('REQUEST_URI'))) {
             $this->script = true;