fixed caching

heimrichhannot · Jun 29, 2018 · a5e6735 · a5e6735
1 parent 25abeeb
commit a5e6735
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Manager/ListManager.php b/src/Manager/ListManager.php
@@ -102,6 +102,11 @@ class ListManager implements ListManagerInterface
      */
     protected $database;
 
+    /**
+     * @var array
+     */
+    protected static $listConfigCache = [];
+
     public function __construct(
         ContaoFrameworkInterface $framework,
         ListConfigRegistry $listConfigRegistry,
@@ -134,13 +139,15 @@ public function __construct(
      */
     public function getListConfig(): ListConfigModel
     {
+        $listConfigId = $this->moduleData['listConfig'];
+
         // Caching
-        if (null !== $this->listConfig) {
+        if (isset(static::$listConfigCache[$listConfigId]) && null !== static::$listConfigCache[$listConfigId]) {
+            $this->listConfig = static::$listConfigCache[$listConfigId];
+
             return $this->listConfig;
         }
 
-        $listConfigId = $this->moduleData['listConfig'];
-
         if (!$listConfigId || null === ($listConfig = $this->listConfigRegistry->findByPk($listConfigId))) {
             throw new \Exception(sprintf('The module %s has no valid list config. Please set one.', $this->moduleData['id']));
         }
@@ -150,6 +157,8 @@ public function getListConfig(): ListConfigModel
 
         $this->listConfig = $listConfig;
 
+        static::$listConfigCache[$listConfigId] = $this->listConfig;
+
         return $listConfig;
     }