X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplfeed.php;h=a8c51f20a0bcc2ae7dcf0a4e9f76ebd509c3e525;hb=5f6b3a28efe41c038f349fb0b281d9637f7078de;hp=7d660e5e9805ca364b17a64c4e007fed640086ee;hpb=3ecd0a882aebbb539b4b0e507a360e961cd51c63;p=platal.git

diff --git a/classes/plfeed.php b/classes/plfeed.php
index 7d660e5..a8c51f2 100644
--- a/classes/plfeed.php
+++ b/classes/plfeed.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -95,19 +95,14 @@ abstract class PlFeed implements PlIterator
         return $this->iterator->last();
     }
 
-    public function run(PlPage& $page, $login, $token, $require_auth = true, $type = 'rss2')
+    public function run(PlPage& $page, PlUser& $user, $require_auth = true, $type = 'rss2')
     {
-        $user = Platal::session()->tokenAuth($login, $token);
-        if (empty($user)) {
-            if ($require_auth) {
-                return PL_FORBIDDEN;
-            } else {
-                $user = null;
-            }
+        if (empty($user) && $require_auth) {
+            return PL_FORBIDDEN;
         }
 
         $page->assign('rss_hash', $token);
-        header('Content-Type: application/rss+xml; charset=utf8');
+        pl_content_headers("application/rss+xml");
         $this->iterator = $this->fetch($user);
         $page->coreTpl('feed.' . $type . '.tpl', NO_SKIN);
         $page->assign_by_ref('feed', $this);