diff options
Diffstat (limited to 'app')
| -rwxr-xr-x | app/controllers/feedController.php | 6 | ||||
| -rw-r--r-- | app/models/Feed.php | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php index e0c526655..6d25fe092 100755 --- a/app/controllers/feedController.php +++ b/app/controllers/feedController.php @@ -340,10 +340,10 @@ class feedController extends ActionController { Session::_param ('notification', $notif); Session::_param ('actualize_feeds', true); - // et on redirige vers la page import/export + // et on redirige vers la page d'accueil Request::forward (array ( - 'c' => 'configure', - 'a' => 'importExport' + 'c' => 'index', + 'a' => 'index' ), true); } diff --git a/app/models/Feed.php b/app/models/Feed.php index 14366c5b3..c1d0379a9 100644 --- a/app/models/Feed.php +++ b/app/models/Feed.php @@ -247,10 +247,8 @@ class Feed extends Model { $this->_url ($subscribe_url); } - if (empty($this->name)) { // May come from OPML - $title = $feed->get_title (); - $this->_name (!is_null ($title) ? $title : $this->url); - } + $title = $feed->get_title (); + $this->_name (!is_null ($title) ? $title : $this->url); $this->_website ($feed->get_link ()); $this->_description ($feed->get_description ()); |