diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-01-06 21:59:50 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-01-06 21:59:50 +0100 |
| commit | 541dd1e5791a5e9fac57b05a963cc880d71f7d22 (patch) | |
| tree | 02ac6eafc926fcdc1e9ef293f904de7d530534a4 | |
| parent | 0f82604addfdbafdec26528aa4faa2590a72d8f9 (diff) | |
fix #903
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | controller/feedcontroller.php | 2 | ||||
| -rw-r--r-- | js/admin/Admin.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7971281d7..f8b18363c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ owncloud-news (7.0.0) +* **Bugfix**: Fix bug that prevented non admin users from changing feed parameters * **Backwards incompatible change**: Remove console commands and instead run them after specific updates -* **Enhancement**: If a feed failed to update more than 10 times, show a hint in the web interface +* **Enhancement**: If a feed failed to update more than 100 times, show a hint in the web interface owncloud-news (6.1.1) * **Security**: Update picoFeed to add an [XXE fix for php-fpm](http://framework.zend.com/security/advisory/ZF2015-06) on systems with PHP <5.5.22 or >5.6 and <5.6.6. This issue allows any user with access to the News app to read abitrary files from the server. For more information read up on the [Zend advisory](http://framework.zend.com/security/advisory/ZF2015-06) and the [OWASP page](https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing). Affected supported distributions include [Ubuntu 14.04](https://bugs.launchpad.net/ubuntu/trusty/+source/php5/+bug/1509817) diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index 0b6948a15..37e415661 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -258,7 +258,7 @@ class FeedController extends Controller { return []; } - /* + /** * @NoAdminRequired * * @param int $feedId diff --git a/js/admin/Admin.js b/js/admin/Admin.js index 93b5f0268..4ba52f3e9 100644 --- a/js/admin/Admin.js +++ b/js/admin/Admin.js @@ -92,7 +92,7 @@ button.addClass('loading'); $.post(OC.generateUrl('/apps/news/admin/migrate')) - .always(function (data) { + .always(function () { button.removeClass('loading'); }); |