diff options
author | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
commit | 43c77f658a905e2def6aeca4c092683977cd0c55 (patch) | |
tree | cb0dc273a315a777847d251f856625b2fc779c04 /application/ApplicationUtils.php | |
parent | 630ebca2b6359e942e5b6c057cca2b6069c1093a (diff) | |
parent | 1826e383ecf501302974132fd443cf1ca06e10f6 (diff) | |
download | Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.gz Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.zst Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.zip |
Merge commit '1826e383ecf501302974132fd443cf1ca06e10f6' into v0.10
Diffstat (limited to 'application/ApplicationUtils.php')
-rw-r--r-- | application/ApplicationUtils.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index 911873a0..a3b2dcb1 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -24,7 +24,7 @@ class ApplicationUtils | |||
24 | * | 24 | * |
25 | * @return mixed the version code from the repository if available, else 'false' | 25 | * @return mixed the version code from the repository if available, else 'false' |
26 | */ | 26 | */ |
27 | public static function getLatestGitVersionCode($url, $timeout=2) | 27 | public static function getLatestGitVersionCode($url, $timeout = 2) |
28 | { | 28 | { |
29 | list($headers, $data) = get_http_response($url, $timeout); | 29 | list($headers, $data) = get_http_response($url, $timeout); |
30 | 30 | ||
@@ -86,13 +86,14 @@ class ApplicationUtils | |||
86 | * | 86 | * |
87 | * @return mixed the new version code if available and greater, else 'false' | 87 | * @return mixed the new version code if available and greater, else 'false' |
88 | */ | 88 | */ |
89 | public static function checkUpdate($currentVersion, | 89 | public static function checkUpdate( |
90 | $updateFile, | 90 | $currentVersion, |
91 | $checkInterval, | 91 | $updateFile, |
92 | $enableCheck, | 92 | $checkInterval, |
93 | $isLoggedIn, | 93 | $enableCheck, |
94 | $branch='stable') | 94 | $isLoggedIn, |
95 | { | 95 | $branch = 'stable' |
96 | ) { | ||
96 | // Do not check versions for visitors | 97 | // Do not check versions for visitors |
97 | // Do not check if the user doesn't want to | 98 | // Do not check if the user doesn't want to |
98 | // Do not check with dev version | 99 | // Do not check with dev version |