diff options
| author |  Clément <clement@selfhost.fr>
| 2017-02-25 10:20:35 +0100 |
|---|---|---|
| committer | Clément <clement@selfhost.fr>
| 2017-02-25 10:20:35 +0100 |
| commit | 3684d201bda997fdbfd4460dae92100ee47dd7ef (patch) | |
| tree | 820d753f57c1c5ce455cbb9a68332be681fe5882 /app/Controllers | |
| parent | 2d097bc855dbd1ad06c7c306c05e78a198209084 (diff) | |
| parent | 30ba0753e3fbb7417766f72010c7dd700567bf64 (diff) | |
Merge remote-tracking branch 'FreshRSS/dev' into dev
Diffstat (limited to 'app/Controllers')
| -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); } |