diff options
author | VirtualTam <virtualtam@flibidi.net> | 2015-12-03 20:30:46 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2015-12-03 20:30:46 +0100 |
commit | 4a7af9759a1874bdf6ec00a286040a3c64b9870e (patch) | |
tree | 4201598fb5b722e45a573a30452fe430145338f7 | |
parent | b6a54537b8823d2b96e9bdb64e280959d6681c36 (diff) | |
download | Shaarli-4a7af9759a1874bdf6ec00a286040a3c64b9870e.tar.gz Shaarli-4a7af9759a1874bdf6ec00a286040a3c64b9870e.tar.zst Shaarli-4a7af9759a1874bdf6ec00a286040a3c64b9870e.zip |
fix: assign template variables to empty values so they can be evaluated
Regression introduced in #394
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r-- | application/ApplicationUtils.php | 2 | ||||
-rw-r--r-- | index.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index 6d878110..274331e1 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -50,6 +50,8 @@ class ApplicationUtils | |||
50 | * @param bool $enableCheck whether to check for new versions | 50 | * @param bool $enableCheck whether to check for new versions |
51 | * @param bool $isLoggedIn whether the user is logged in | 51 | * @param bool $isLoggedIn whether the user is logged in |
52 | * | 52 | * |
53 | * @throws Exception an invalid branch has been set for update checks | ||
54 | * | ||
53 | * @return mixed the new version code if available and greater, else 'false' | 55 | * @return mixed the new version code if available and greater, else 'false' |
54 | */ | 56 | */ |
55 | public static function checkUpdate($currentVersion, | 57 | public static function checkUpdate($currentVersion, |
@@ -643,9 +643,11 @@ class pageBuilder | |||
643 | $GLOBALS['config']['UPDATECHECK_BRANCH'] | 643 | $GLOBALS['config']['UPDATECHECK_BRANCH'] |
644 | ); | 644 | ); |
645 | $this->tpl->assign('newVersion', escape($version)); | 645 | $this->tpl->assign('newVersion', escape($version)); |
646 | $this->tpl->assign('versionError', ''); | ||
646 | 647 | ||
647 | } catch (Exception $exc) { | 648 | } catch (Exception $exc) { |
648 | logm($exc->getMessage()); | 649 | logm($exc->getMessage()); |
650 | $this->tpl->assign('newVersion', ''); | ||
649 | $this->tpl->assign('versionError', escape($exc->getMessage())); | 651 | $this->tpl->assign('versionError', escape($exc->getMessage())); |
650 | } | 652 | } |
651 | 653 | ||