Merge pull request #215 from magento-south/MAGETWO-35818

[South] Bug fixing
magento · Apr 6, 2015 · 569b0d6 · 569b0d6
2 parents 85dfbb0 + 768e436
commit 569b0d6
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php
@@ -58,15 +58,10 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
+        $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
         $requireJsConfig = $this->fileManager->createRequireJsConfigAsset();
         $assetCollection = $this->pageConfig->getAssetCollection();
 
-        $assetCollection->insert(
-            $requireJsConfig->getFilePath(),
-            $requireJsConfig,
-            RequireJsConfig::REQUIRE_JS_FILE_NAME
-        );
-
         if ($this->bundleConfig->isBundlingJsFiles()) {
             $bundleAssets = $this->fileManager->createBundleJsPool();
             $staticAsset = $this->fileManager->createStaticJsAsset();
@@ -81,10 +76,21 @@ protected function _prepareLayout()
                         RequireJsConfig::REQUIRE_JS_FILE_NAME
                     );
                 }
-                $assetCollection->insert($staticAsset->getFilePath(), $staticAsset, RequireJsConfig::CONFIG_FILE_NAME);
+                $assetCollection->insert(
+                    $staticAsset->getFilePath(),
+                    $staticAsset,
+                    reset($bundleAssets)->getFilePath()
+                );
+                $after = $staticAsset->getFilePath();
             }
         }
 
+        $assetCollection->insert(
+            $requireJsConfig->getFilePath(),
+            $requireJsConfig,
+            $after
+        );
+
         return parent::_prepareLayout();
     }