#6457 Disentangle beacon enable/disable from upgrade warning (stable-…

…3_2_1)
pkp · Dec 9, 2020 · f9826bf · f9826bf
1 parent 6aaae66
commit f9826bf
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/pages/management/ManagementHandler.inc.php b/pages/management/ManagementHandler.inc.php
@@ -109,20 +109,23 @@ function context($args, $request) {
 
 		$templateMgr->assign('settingsData', $settingsData);
 
+		// 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);