From: x2003bruneau Date: Fri, 2 Feb 2007 22:41:18 +0000 (+0000) Subject: Remove utf8_encode in banana-interfaces X-Git-Tag: xorg/0.9.14~296 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=fa2056feddfcd83a1d053599af1c722b0cdbb2a3;p=platal.git Remove utf8_encode in banana-interfaces Catch emails in ChangeLog git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1470 839d8a87-29fc-0310-9880-83ba4fa771e5 --- diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php index a6bce7c..a713c22 100644 --- a/include/banana/forum.inc.php +++ b/include/banana/forum.inc.php @@ -98,9 +98,9 @@ class ForumsBanana extends Banana FROM {$globals->banana->table_prefix}abos LEFT JOIN {$globals->banana->table_prefix}list ON list.fid=abos.fid WHERE uid={?}", S::i('uid')); - Banana::$profile['headers']['From'] = utf8_encode("$nom <$mail>"); + Banana::$profile['headers']['From'] = "$nom <$mail>"; Banana::$profile['headers']['Organization'] = 'Utilisateur de Polytechnique.org'; - Banana::$profile['signature'] = utf8_encode($sig); + Banana::$profile['signature'] = $sig; Banana::$profile['display'] = $disp; Banana::$profile['autoup'] = $maj; Banana::$profile['lastnews'] = S::v('banana_last'); @@ -121,7 +121,7 @@ class ForumsBanana extends Banana . 'Marquer tous les messages comme lus' . '', array('forums', 'thread', 'message')); } - Banana::$page->registerPage('profile', utf8_encode('Préférences'), null); + Banana::$page->registerPage('profile', 'Préférences', null); // Run Banana diff --git a/modules/platal.php b/modules/platal.php index 34985f4..a462e79 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -84,6 +84,8 @@ class PlatalModule extends PLModule $page->changeTpl('platal/changeLog.tpl'); $clog = pl_entities(file_get_contents(dirname(__FILE__).'/../ChangeLog')); + require_once 'url_catcher.inc.php'; + $clog = url_catcher($clog); $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog); $clog = preg_replace('!vim:.*$!', '', $clog); $page->assign('ChangeLog', $clog);