Decrease extraneous fetches

pkp · Jun 24, 2024 · 5c0e9a2 · 5c0e9a2
1 parent bb29c38
commit 5c0e9a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/classes/core/PKPApplication.php b/classes/core/PKPApplication.php
@@ -31,6 +31,7 @@
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
 use PKP\security\Role;
+use PKP\site\Version;
 use PKP\site\VersionDAO;
 use PKP\submission\RepresentationDAOInterface;
 
@@ -307,9 +308,7 @@ public function getHttpClient()
         $application = Application::get();
         $userAgent = $application->getName() . '/';
         if (static::isInstalled() && !static::isUpgrading()) {
-            /** @var \PKP\site\VersionDAO */
-            $versionDao = DAORegistry::getDAO('VersionDAO');
-            $currentVersion = $versionDao->getCurrentVersion();
+            $currentVersion = $application->getCurrentVersion();
             $userAgent .= $currentVersion->getVersionString();
         } else {
             $userAgent .= '?';
@@ -451,13 +450,10 @@ abstract public function getPluginCategories();
 
     /**
      * Return the current version of the application.
-     *
-     * @return \PKP\site\Version
      */
-    public function getCurrentVersion()
+    public function getCurrentVersion(): Version
     {
         $currentVersion = $this->getEnabledProducts('core');
-        assert(count($currentVersion)) == 1;
         return $currentVersion[$this->getName()];
     }
 

diff --git a/classes/template/PKPTemplateManager.php b/classes/template/PKPTemplateManager.php
@@ -2154,7 +2154,7 @@ public function smartyLoadStylesheet($params, $smarty)
 
         if (!PKPSessionGuard::isSessionDisable()) {
             $versionDao = DAORegistry::getDAO('VersionDAO'); /** @var VersionDAO $versionDao */
-            $appVersion = $versionDao->getCurrentVersion()->getVersionString();
+            $appVersion = Application::get()->getCurrentVersion()->getVersionString();
         } else {
             $appVersion = null;
         }
@@ -2243,8 +2243,7 @@ public function smartyLoadScript($params, $smarty)
         }
 
         if (!PKPSessionGuard::isSessionDisable()) {
-            $versionDao = DAORegistry::getDAO('VersionDAO'); /** @var VersionDAO $versionDao */
-            $appVersion = $versionDao->getCurrentVersion()->getVersionString();
+            $appVersion = Application::get()->getCurrentVersion()->getVersionString();
         } else {
             $appVersion = null;
         }