Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #398 from virtualtam/fix/initialize-version-vars

Browse source 
fix: assign template variables to empty values so they can be evaluated
This commit is contained in:
VirtualTam 2015-12-03 21:13:51 +01:00
commit a6aa37b96f
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/ApplicationUtils.php
View file

@ -50,6 +50,8 @@ public static function getLatestGitVersionCode($url, $timeout=2)
* @param bool $enableCheck whether to check for new versions * @param bool $enableCheck whether to check for new versions
* @param bool $isLoggedIn whether the user is logged in * @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' * @return mixed the new version code if available and greater, else 'false'
*/ */
public static function checkUpdate($currentVersion, public static function checkUpdate($currentVersion,

2
index.php
View file

@ -643,9 +643,11 @@ private function initialize()
$GLOBALS['config']['UPDATECHECK_BRANCH'] $GLOBALS['config']['UPDATECHECK_BRANCH']
); );
$this->tpl->assign('newVersion', escape($version)); $this->tpl->assign('newVersion', escape($version));
$this->tpl->assign('versionError', '');
} catch (Exception $exc) { } catch (Exception $exc) {
logm($exc->getMessage()); logm($exc->getMessage());
$this->tpl->assign('newVersion', '');
$this->tpl->assign('versionError', escape($exc->getMessage())); $this->tpl->assign('versionError', escape($exc->getMessage()));
} }