Prevent making addon instances multiple times

statamic · Oct 28, 2020 · d4ce470 · d4ce470
1 parent 3b08793
commit d4ce470
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Extend/AddonRepository.php b/src/Extend/AddonRepository.php
@@ -4,6 +4,8 @@
 
 class AddonRepository
 {
+    protected $addons;
+
     /**
      * Make an addon instance.
      *
@@ -25,7 +27,7 @@ public function make($addon)
      */
     public function all()
     {
-        return app(Manifest::class)->addons()->map(function ($addon) {
+        return $this->addons = $this->addons ?? app(Manifest::class)->addons()->map(function ($addon) {
             return $this->make($addon);
         });
     }
@@ -37,8 +39,6 @@ public function all()
      */
     public function get($id)
     {
-        return $this->make(
-            app(Manifest::class)->addons()->get($id)
-        );
+        return $this->all()->get($id);
     }
 }