Merge pull request #1137 from Alkarex/feed_password

But when adding feeds with passwords
pull/1143/head
Alexandre Alapetite 9 years ago
commit 5bb45c2e2c
  1. 3
      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();

Loading…
Cancel
Save