on my server (i7) this improves the loading time by another 500-800ms

1 files changed, 10 insertions, 7 deletions

diff --git a/core/AssetManager/UIAssetCatalog.php b/core/AssetManager/UIAssetCatalog.php
index 8c7ba10e3b..d8a45f8964 100644
--- a/core/AssetManager/UIAssetCatalog.php
+++ b/core/AssetManager/UIAssetCatalog.php
@@ -21,6 +21,11 @@ class UIAssetCatalog
     private $catalogSorter;
 
     /**
+     * @var string[]  Absolute file locations
+     */
+    private $existingAssetLocations = array();
+
+    /**
      * @param UIAssetCatalogSorter $catalogSorter
      */
     function __construct($catalogSorter)
@@ -33,8 +38,10 @@ class UIAssetCatalog
      */
     public function addUIAsset($uiAsset)
     {
-        if(!$this->assetAlreadyInCatalog($uiAsset)) {
+        $location = $uiAsset->getAbsoluteLocation();
 
+        if(!$this->assetAlreadyInCatalog($location)) {
+            $this->existingAssetLocations[] = $location;
             $this->uiAssets[] = $uiAsset;
         }
     }
@@ -59,12 +66,8 @@ class UIAssetCatalog
      * @param UIAsset $uiAsset
      * @return boolean
      */
-    private function assetAlreadyInCatalog($uiAsset)
+    private function assetAlreadyInCatalog($location)
     {
-        foreach($this->uiAssets as $existingAsset)
-            if($uiAsset->getAbsoluteLocation() == $existingAsset->getAbsoluteLocation())
-                return true;
-
-        return false;
+        return in_array($location, $this->existingAssetLocations);
     }
 }