diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-03-11 10:36:48 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-03-11 10:36:48 +0100 |
| commit | be0bcfef7e38f27284ec7b377b342ba389515964 (patch) | |
| tree | 59d2d5a8e34fcb279a53a2b44fde1e36c888672d /app/Controllers/updateController.php | |
| parent | 5f637bd816b7323885bfe1751a1724ee59a822f6 (diff) | |
| parent | b34c318f02574b13560731035fd5a4f750aa1e9b (diff) | |
Merge pull request #1455 from FreshRSS/dev1.6.3
Release 1.6.3
Diffstat (limited to 'app/Controllers/updateController.php')
| -rw-r--r-- | app/Controllers/updateController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 8f939dbdb..b4e8a0bff 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -162,7 +162,7 @@ class FreshRSS_update_Controller extends Minz_ActionController { } public function applyAction() { - if (!file_exists(UPDATE_FILENAME) || !is_writable(FRESHRSS_PATH)) { + if (!file_exists(UPDATE_FILENAME) || !is_writable(FRESHRSS_PATH) || Minz_Configuration::get('system')->disable_update) { Minz_Request::forward(array('c' => 'update'), true); } |