Fix RSS charset

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1572 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index 3190db2..2147954 100644 (file)
--- a/htdocs/css/keynote.css
+++ b/htdocs/css/keynote.css
@@ -51,6 +51,7 @@ fieldset {
     background: url('../images/skins/keynote_bg_lighter.png') #848495 top left repeat-x fixed;
     color: #000;
     margin: 1em 0 1em 0;
+    text-align: justify;
 }
 legend {
     border-bottom: 1px solid #666;

diff --git a/include/rss.inc.php b/include/rss.inc.php
index 41ede2c..b461376 100644 (file)
--- a/include/rss.inc.php
+++ b/include/rss.inc.php
@@ -28,21 +28,11 @@ function _rss_encode_date($d) {
     return date('r', $t);
 }
 
-function to_rss ($s)
-{
-    if(is_string($s)) {
-        return iconv('ISO_8859-15', 'UTF8', $s);
-    } else {
-        return $s;
-    }
-}
-
 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

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index d4a9612..6517494 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -959,7 +959,7 @@ class XnetGrpModule extends PLModule
         global $globals;
         require_once('rss.inc.php');
         $uid = init_rss('xnetgrp/announce-rss.tpl', $user, $hash, false);
-        $page->register_modifier('url_catcher', array(MiniWiki,'WikiToHTML'));
+        $page->register_modifier('url_catcher', array('MiniWiki', 'WikiToHTML'));
 
         if ($uid) {
             $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.contacts, a.create_date,