summaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-06-12 22:21:57 +0200
committerGravatar GitHub <noreply@github.com> 2016-06-12 22:21:57 +0200
commit7bc2ff45009a601550d77007c94ec23e2ced8f19 (patch)
tree8f175b55e291a152d2811d85f4a6d085f18f6849 /app/Controllers/feedController.php
parent8dcc0fd65a36adedb12e5d54bafb39e7e553d38b (diff)
parent17de4363b5b0ab3f3ddc703ccf98332770040e17 (diff)
Merge pull request #1165 from FreshRSS/dev1.3.2-beta
Release 1.3.2-beta
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b559d3c22..6a8aa01cf 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -114,6 +114,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
Minz_Request::bad(_t('feedback.sub.feed.invalid_url', $url), $url_redirect);
}
+ $feed->_httpAuth($http_auth);
+
try {
$feed->load(true);
} catch (FreshRSS_Feed_Exception $e) {
@@ -140,7 +142,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
$feed->_category($cat);
- $feed->_httpAuth($http_auth);
// Call the extension hook
$name = $feed->name();