aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 15:08:57 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 15:08:57 +0200
commitd2ee43905fb1358b0108c66bc7cd7c26c4b77c2d (patch)
tree7c4215a82910559ab07fd23c1d09d78628506cf3 /app/Controllers
parent60b1e032bc328a422e44e602d33757ca5c51fa4f (diff)
parentf54876ac2dca6f2685f35891465f71d56e1f6c86 (diff)
Merge branch 'FreshRSS/dev' into dev
Diffstat (limited to 'app/Controllers')
-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();