avoid extra sql queries

spatie · Jul 26, 2015 · 66e128b · 66e128b
1 parent 74a9689
commit 66e128b
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/Conversion/ConversionCollection.php b/src/Conversion/ConversionCollection.php
@@ -55,21 +55,22 @@ public function getByName($name)
      */
     protected function addConversionsFromRelatedModel(Media $media)
     {
-        static $cachedRegistrations = [];
-
-        $cacheKey = $media->model_type;
-
-        if (! isset($cachedRegistrations[$cacheKey])) {
-
-            $cachedRegistrations[$cacheKey] = [];
-
-            if ($media->model instanceof HasMedia) {
-                $media->model->registerMediaConversions();
-                $cachedRegistrations[$cacheKey] = $media->model->mediaConversions;
-            }
+        $modelName = $media->model_type;
+
+        /*
+         * To prevent an sql query create a new model instead
+         * of the using the associated one
+         */
+        $model = new $modelName();
+
+        if ($model instanceof HasMedia) {
+            /*
+             * TODO: make this method static in the next version
+             */
+            $model->registerMediaConversions();
         }
 
-        $this->items = $cachedRegistrations[$cacheKey];
+        $this->items = $model->mediaConversions;
     }
 
     /**