diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-03-12 15:02:06 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-03-12 15:05:59 +0100 |
commit | b897c81f8cbf117828fb710f0827f124025f9a89 (patch) | |
tree | 5e559eb8c0d227696a8c3f870eb94a1b539962ec /application/ApplicationUtils.php | |
parent | 7fc5f07492b9bfe58cb33907ceb42e9bccd624ce (diff) | |
download | Shaarli-b897c81f8cbf117828fb710f0827f124025f9a89.tar.gz Shaarli-b897c81f8cbf117828fb710f0827f124025f9a89.tar.zst Shaarli-b897c81f8cbf117828fb710f0827f124025f9a89.zip |
Use 'dev' version on the master branch
Allowed check branches are now `latest` and `stable`.
Diffstat (limited to 'application/ApplicationUtils.php')
-rw-r--r-- | application/ApplicationUtils.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index a0f482b0..94c49040 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -5,7 +5,7 @@ | |||
5 | class ApplicationUtils | 5 | class ApplicationUtils |
6 | { | 6 | { |
7 | private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli'; | 7 | private static $GIT_URL = 'https://raw.githubusercontent.com/shaarli/Shaarli'; |
8 | private static $GIT_BRANCHES = array('master', 'stable'); | 8 | private static $GIT_BRANCHES = array('latest', 'stable'); |
9 | private static $VERSION_FILE = 'shaarli_version.php'; | 9 | private static $VERSION_FILE = 'shaarli_version.php'; |
10 | private static $VERSION_START_TAG = '<?php /* '; | 10 | private static $VERSION_START_TAG = '<?php /* '; |
11 | private static $VERSION_END_TAG = ' */ ?>'; | 11 | private static $VERSION_END_TAG = ' */ ?>'; |
@@ -65,13 +65,10 @@ class ApplicationUtils | |||
65 | $isLoggedIn, | 65 | $isLoggedIn, |
66 | $branch='stable') | 66 | $branch='stable') |
67 | { | 67 | { |
68 | if (! $isLoggedIn) { | 68 | // Do not check versions for visitors |
69 | // Do not check versions for visitors | 69 | // Do not check if the user doesn't want to |
70 | return false; | 70 | // Do not check with dev version |
71 | } | 71 | if (! $isLoggedIn || empty($enableCheck) || $currentVersion === 'dev') { |
72 | |||
73 | if (empty($enableCheck)) { | ||
74 | // Do not check if the user doesn't want to | ||
75 | return false; | 72 | return false; |
76 | } | 73 | } |
77 | 74 | ||