Make view's customScriptsLoaded more robust

The prior flag was instance-based and could lead to multiple theme custom.php loads if multiple instances of Omeka_View were created.
omeka · Oct 30, 2024 · 5e4c86b · 5e4c86b
1 parent 0c26543
commit 5e4c86b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/application/libraries/Omeka/Test/AppTestCase.php b/application/libraries/Omeka/Test/AppTestCase.php
@@ -176,6 +176,7 @@ public function reset()
         Zend_Controller_Action_HelperBroker::resetHelpers();
         $this->frontController->resetInstance();
         Zend_Session::$_unitTestEnabled = true;
+        Omeka_View::$customScriptsLoaded = false;
     }
 
     /**

diff --git a/application/libraries/Omeka/View.php b/application/libraries/Omeka/View.php
@@ -35,7 +35,7 @@ class Omeka_View extends Zend_View_Abstract
      *
      * @var bool
      */
-    private $_customScriptsLoaded = false;
+    public static $customScriptsLoaded = false;
 
     /**
      * @param array $config View configuration.
@@ -125,7 +125,7 @@ public function _run()
      */
     private function _loadCustomThemeScripts()
     {
-        if ($this->_customScriptsLoaded) {
+        if (self::$customScriptsLoaded) {
             return;
         }
 
@@ -144,7 +144,7 @@ private function _loadCustomThemeScripts()
         if ($pluginBroker) {
             $pluginBroker->setCurrentPluginDirName($tmpPluginDir);
         }
-        $this->_customScriptsLoaded = true;
+        self::$customScriptsLoaded = true;
     }
 
     /**