X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Frss.inc.php;h=a52bfbebbee10f13ee0d3c3e65f31580a1ff2df2;hb=6544d0e1de719d31db03a7c7fddfe4c0301d9d6d;hp=5bfcffaab8b6c5a9cc9350455e0c02f5f4296b50;hpb=801fcad813666310da1ca5b6f07f91cfed1abbee;p=platal.git

diff --git a/include/rss.inc.php b/include/rss.inc.php
index 5bfcffa..a52bfbe 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   *
@@ -25,19 +25,19 @@ function _rss_encode_date($d) {
     } else {
         $t = strtotime($d);
     }
-    return utf8_encode(date('r', $t));
+    return date('r', $t);
 }
 
 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;
     $page->changeTpl($template, NO_SKIN);
@@ -52,12 +52,16 @@ 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');
     return $uid;
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>