diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-10-08 15:05:50 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-10-08 15:05:50 +0200 |
commit | b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84 (patch) | |
tree | b6bd2d066410bc8e6a09bbd057df728b5de1493e /application/Updater.php | |
parent | 2c049b673acdd10125db9c3c271eef5bd3f5fc17 (diff) | |
parent | ecccb14e2ab4e5f372ea9946b29995c3c7122a5c (diff) | |
download | Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.tar.gz Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.tar.zst Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.zip |
Merge tag 'v0.9.2' into latest
Release v0.9.2
Diffstat (limited to 'application/Updater.php')
-rw-r--r-- | application/Updater.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/Updater.php b/application/Updater.php index 40a15906..72b2def0 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -398,7 +398,7 @@ class Updater | |||
398 | */ | 398 | */ |
399 | public function updateMethodCheckUpdateRemoteBranch() | 399 | public function updateMethodCheckUpdateRemoteBranch() |
400 | { | 400 | { |
401 | if (shaarli_version === 'dev' || $this->conf->get('updates.check_updates_branch') === 'latest') { | 401 | if (SHAARLI_VERSION === 'dev' || $this->conf->get('updates.check_updates_branch') === 'latest') { |
402 | return true; | 402 | return true; |
403 | } | 403 | } |
404 | 404 | ||
@@ -413,7 +413,7 @@ class Updater | |||
413 | $latestMajor = $matches[1]; | 413 | $latestMajor = $matches[1]; |
414 | 414 | ||
415 | // Get current major version digit | 415 | // Get current major version digit |
416 | preg_match('/(\d+)\.\d+$/', shaarli_version, $matches); | 416 | preg_match('/(\d+)\.\d+$/', SHAARLI_VERSION, $matches); |
417 | $currentMajor = $matches[1]; | 417 | $currentMajor = $matches[1]; |
418 | 418 | ||
419 | if ($currentMajor === $latestMajor) { | 419 | if ($currentMajor === $latestMajor) { |