From 4a7af9759a1874bdf6ec00a286040a3c64b9870e Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 3 Dec 2015 20:30:46 +0100 Subject: [PATCH] fix: assign template variables to empty values so they can be evaluated Regression introduced in #394 Signed-off-by: VirtualTam --- application/ApplicationUtils.php | 2 ++ index.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index 6d87811..274331e 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php @@ -50,6 +50,8 @@ class ApplicationUtils * @param bool $enableCheck whether to check for new versions * @param bool $isLoggedIn whether the user is logged in * + * @throws Exception an invalid branch has been set for update checks + * * @return mixed the new version code if available and greater, else 'false' */ public static function checkUpdate($currentVersion, diff --git a/index.php b/index.php index d26c0c1..e259204 100644 --- a/index.php +++ b/index.php @@ -643,9 +643,11 @@ class pageBuilder $GLOBALS['config']['UPDATECHECK_BRANCH'] ); $this->tpl->assign('newVersion', escape($version)); + $this->tpl->assign('versionError', ''); } catch (Exception $exc) { logm($exc->getMessage()); + $this->tpl->assign('newVersion', ''); $this->tpl->assign('versionError', escape($exc->getMessage())); }