xhtml validation, and small skin improvements.

[platal.git] / include / rss.inc.php

diff --git a/include/rss.inc.php b/include/rss.inc.php
index dfa0c43..22a8a2b 100644 (file)
--- a/include/rss.inc.php
+++ b/include/rss.inc.php
@@ -25,16 +25,7 @@ function _rss_encode_date($d) {
     } else {
         $t = strtotime($d);
     }
-    return utf8_encode(date('r', $t));
-}
-
-function to_rss ($s)
-{
-    if(is_string($s)) {
-        return iconv('ISO_8859-15', 'UTF8', $s);
-    } else {
-        return $s;
-    }
+    return date('r', $t);
 }
 
 function init_rss($template, $alias, $hash, $require_uid = true)
@@ -42,7 +33,6 @@ function init_rss($template, $alias, $hash, $require_uid = true)
     global $page;
     $page->changeTpl($template, NO_SKIN);
     $page->register_modifier('rss_date', '_rss_encode_date');
-    $page->default_modifiers = Array('@to_rss');
 
     $res = XDB::query(
         'SELECT  a.id
@@ -59,7 +49,9 @@ function init_rss($template, $alias, $hash, $require_uid = true)
         }
     }
 
-    header('Content-Type: application/rss+xml; charset=utf8');
+    if ($template) {
+        header('Content-Type: application/rss+xml; charset=utf8');
+    }
     return $uid;
 }