X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Frss.inc.php;h=9b8b74b4d8ce51ab4d65f8adf428ade968fe3b64;hb=323e53dc4e0b4d0a65182b179fd27880de0c3ff7;hp=ba9ae91a575390c7b38a1e4a25b91c4234cb8b1f;hpb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;p=platal.git

diff --git a/include/rss.inc.php b/include/rss.inc.php
index ba9ae91..9b8b74b 100644
--- a/include/rss.inc.php
+++ b/include/rss.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -31,16 +31,16 @@ function _rss_encode_date($d) {
 function to_rss ($s)
 {
     if(is_string($s)) {
-        return utf8_encode($s);
+        return iconv('ISO_8859-15', 'UTF8', $s);
     } else {
         return $s;
     }
 }
 
-function init_rss($template, $alias, $hash)
+function init_rss($template, $alias, $hash, $require_uid = true)
 {
-    global $page, $globals;
-    new_nonhtml_page($template, AUTH_PUBLIC);
+    global $page;
+    $page->changeTpl($template, NO_SKIN);
     $page->register_modifier('rss_date', '_rss_encode_date');
     $page->default_modifiers = Array('@to_rss');
 
@@ -52,7 +52,11 @@ function init_rss($template, $alias, $hash)
     $uid = $res->fetchOneCell();
 
     if (empty($uid)) {
-        exit;
+        if ($require_uid) {
+            exit;
+        } else {
+            $uid = null;
+        }
     }
 
     header('Content-Type: application/rss+xml; charset=utf8');