From b32509efb01e534957d6e8f717a422767218243e Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Wed, 9 Dec 2020 09:20:23 -0800
Subject: [PATCH] pkp/pkp-lib#6457 Disentangle beacon enable/disable from
 upgrade warning

---
 pages/admin/AdminHandler.inc.php           | 22 ++++++++--------
 pages/management/ManagementHandler.inc.php | 29 ++++++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/pages/admin/AdminHandler.inc.php b/pages/admin/AdminHandler.inc.php
index e108a09554b..2daf4ab9edc 100644
--- a/pages/admin/AdminHandler.inc.php
+++ b/pages/admin/AdminHandler.inc.php
@@ -93,16 +93,18 @@ function initialize($request) {
 			]);
 		}
 
-		if (Config::getVar('general', 'show_upgrade_warning')) {
-			import('lib.pkp.classes.site.VersionCheck');
-			if ($latestVersion = VersionCheck::checkIfNewVersionExists()) {
-				$currentVersion = VersionCheck::getCurrentDBVersion();
-				$templateMgr->assign([
-					'currentVersion' => $currentVersion,
-					'newVersionAvailable' => true,
-					'latestVersion' => $latestVersion,
-				]);
-			}
+		// Interact with the beacon (if enabled) and determine if a new version exists
+		import('lib.pkp.classes.site.VersionCheck');
+		$latestVersion = VersionCheck::checkIfNewVersionExists();
+
+		// Display a warning message if there is a new version of OJS available
+		if (Config::getVar('general', 'show_upgrade_warning') && $latestVersion) {
+			$currentVersion = VersionCheck::getCurrentDBVersion();
+			$templateMgr->assign([
+				'newVersionAvailable' => true,
+				'currentVersion' => $currentVersion,
+				'latestVersion' => $latestVersion,
+			]);
 		}
 
 		return parent::initialize($request);
diff --git a/pages/management/ManagementHandler.inc.php b/pages/management/ManagementHandler.inc.php
index ce684b7b3bc..fb3d321cbde 100644
--- a/pages/management/ManagementHandler.inc.php
+++ b/pages/management/ManagementHandler.inc.php
@@ -114,20 +114,23 @@ function context($args, $request) {
 			],
 		]);
 
+		// Interact with the beacon (if enabled) and determine if a new version exists
+		import('lib.pkp.classes.site.VersionCheck');
+		$latestVersion = VersionCheck::checkIfNewVersionExists();
+
 		// Display a warning message if there is a new version of OJS available
-		if (Config::getVar('general', 'show_upgrade_warning')) {
-			import('lib.pkp.classes.site.VersionCheck');
-			if ($latestVersion = VersionCheck::checkIfNewVersionExists()) {
-				$templateMgr->assign('newVersionAvailable', true);
-				$templateMgr->assign('latestVersion', $latestVersion);
-				$currentVersion = VersionCheck::getCurrentDBVersion();
-				$templateMgr->assign('currentVersion', $currentVersion->getVersionString());
-
-				// Get contact information for site administrator
-				$roleDao = DAORegistry::getDAO('RoleDAO'); /* @var $roleDao RoleDAO */
-				$siteAdmins = $roleDao->getUsersByRoleId(ROLE_ID_SITE_ADMIN);
-				$templateMgr->assign('siteAdmin', $siteAdmins->next());
-			}
+		if (Config::getVar('general', 'show_upgrade_warning') && $latestVersion) {
+			$currentVersion = VersionCheck::getCurrentDBVersion();
+			$templateMgr->assign([
+				'newVersionAvailable' =>  true,
+				'currentVersion' => $currentVersion->getVersionString()
+				'latestVersion' =>  $latestVersion,
+			]);
+
+			// Get contact information for site administrator
+			$roleDao = DAORegistry::getDAO('RoleDAO'); /* @var $roleDao RoleDAO */
+			$siteAdmins = $roleDao->getUsersByRoleId(ROLE_ID_SITE_ADMIN);
+			$templateMgr->assign('siteAdmin', $siteAdmins->next());
 		}
 
 		AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION);