diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-10-07 12:22:54 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2017-10-07 12:22:54 +0200 |
| commit | 80b15f5d2db8b90fd9b29f94e6bd8652340df4f0 (patch) | |
| tree | b4826cbb03c64b0e5ffb6d0a72f21e0f6b9d9ac8 /application/Updater.php | |
| parent | 1ea88ae7d1b7fb13e18f543e7c2ad99c4ccde19a (diff) | |
| parent | a01437f9e1e4fb5a098877b243828bf6f4936562 (diff) | |
| download | Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.tar.gz Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.tar.zst Shaarli-80b15f5d2db8b90fd9b29f94e6bd8652340df4f0.zip | |
Merge branch 'master' into v0.9
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) { |