diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-04-15 21:54:40 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-04-15 21:54:40 +0200 |
| commit | d14cc25c158af2e713708beef5ce3916150f06dd (patch) | |
| tree | fd5981931d72c64053a2a5a49c878147a8ca10ba | |
| parent | aa75cebbfe3dd2a6f8d8c9f3dfe72091e8381376 (diff) | |
| parent | 9ce0bca45ff01be50bd254a85b0f51eff429c5da (diff) | |
Merge pull request #1498 from marienfressinaud/fix/zip-update
fix: Fix update via ZIP archive
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Controllers/updateController.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 504886a23..3b576aac9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ * (Require manual update for existing installations) * Do not require PHP extension `fileinfo` for favicons [#1461](https://github.com/FreshRSS/FreshRSS/issues/1461) * Fix UI lowest subscription popup hidden [#1479](https://github.com/FreshRSS/FreshRSS/issues/1479) + * Fix update system via ZIP archive [#1498](https://github.com/FreshRSS/FreshRSS/pull/1498) * I18n * Improve English [#1465](https://github.com/FreshRSS/FreshRSS/pull/1465) * Misc. diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index b4e8a0bff..35c7d1124 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -190,6 +190,7 @@ class FreshRSS_update_Controller extends Minz_ActionController { if (self::isGit()) { $res = self::gitPull(); } else { + require(UPDATE_FILENAME); if (Minz_Request::isPost()) { save_info_update(); } |