diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-08 13:12:12 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-08 13:12:12 +0100 |
| commit | 28c77f22900a10ac43c6d61b2b2d1a146feac42a (patch) | |
| tree | e2f4d91502e2a22dede0892e8dcfe693a7873011 /app/Controllers/feedController.php | |
| parent | 188b517daa174ce494f31dec02ae2cff122488ff (diff) | |
Fix a bug with feed_before_insert hook
$feed->name() was called on a null value.
See https://github.com/FreshRSS/FreshRSS/issues/252
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 7dda3840e..379b8d8da 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -139,9 +139,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $feed->_httpAuth($http_auth); // Call the extension hook + $name = $feed->name(); $feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed); if (is_null($feed)) { - Minz_Request::bad(_t('feed_not_added', $feed->name()), $url_redirect); + Minz_Request::bad(_t('feed_not_added', $name), $url_redirect); } $values = array( |