aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 14:51:20 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-04-24 14:51:20 +0200
commit5bb45c2e2c19ef589521b4650618bb4910776110 (patch)
tree964f786dd3f22d63dc833fe1ab60728b1831aee8
parent4862652585da1d69d62914659011c53146b21c17 (diff)
parent91593cecd218413960c4f05f814aaa38d4a0c4ce (diff)
Merge pull request #1137 from Alkarex/feed_password
But when adding feeds with passwords
-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();