aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-11-04 21:45:08 +0100
committerGravatar GitHub <noreply@github.com> 2017-11-04 21:45:08 +0100
commitdb44b4850785d0fa92d3174bf53f37120ae2fce6 (patch)
tree9fc97f774bc3d74aa4ae76355979c4f90195e465
parentafffbfce0758391a52c8c0c5b9766643a49065e8 (diff)
parent90554db7ee8ba7b553da3c1ee0a451de7c6c66b4 (diff)
Merge pull request #1682 from Alkarex/fix_mastodon_share
Small fix Mastodon share
-rw-r--r--CHANGELOG.md4
-rw-r--r--app/FreshRSS.php4
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97fcdcbed..b74efe42f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,10 @@
## 2017-1X-XX FreshRSS 1.8.1-dev
+* Features
+ * Share with Mastodon [#1521](https://github.com/FreshRSS/FreshRSS/issues/1521)
* UI
- Show URL to add subscriptions from third-party tools [#1247](https://github.com/FreshRSS/FreshRSS/issues/1247)
+ * Show URL to add subscriptions from third-party tools [#1247](https://github.com/FreshRSS/FreshRSS/issues/1247)
* SimplePie
* Remove "SimplePie" name from HTTP User-Agent string [#1656](https://github.com/FreshRSS/FreshRSS/pull/1656)
* Bug fixing
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 8f4ee334c..f53c85bfb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -111,8 +111,8 @@ class FreshRSS extends Minz_FrontController {
public static function preLayout() {
switch (Minz_Request::controllerName()) {
case 'index':
- $urlToAuthorize = array_filter(array_map(function($a) {
- if ('POST' === $a['method']) {
+ $urlToAuthorize = array_filter(array_map(function ($a) {
+ if (isset($a['method']) && $a['method'] === 'POST') {
return $a['url'];
}
}, FreshRSS_Context::$user_conf->sharing));