Encoding issues and update ChangeLog

 AUTHORS            |    3 ++-
 ChangeLog          |    6 +++++-
 modules/banana.php |    4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/AUTHORS b/AUTHORS
index ab219df..ead55a9 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 Polytechnique.org TEAM :
 
     Pierre Habouzit         <pierre.habouzit@m4x.org>       project manager
-    Aymeric Augusting       <aymeric.augusting@m4x.org>
+    Aymeric Augustin        <aymeric.augustin@m4x.org>
     Jean Sébastien Bedo     <jean-sebastien.bedo@m4x.org>
     Florent Bruneau         <florent.bruneau@m4x.org>
     Sophie Charbonnier      <sophie.charbonnier@m4x.org>
@@ -11,6 +11,7 @@ Polytechnique.org TEAM :
     Guillaume Gommard       <guillaume.gommard@m4x.org>
     Fabien Laborde          <fabien.laborde@m4x.org>
     Jeremy Lainé            <jeremy.laine@m4x.org>
+    Olivier Le Floch        <olivier.le-floch@m4x.org>
     Raphael Marichez        <raphael.marichez@m4x.org>
     Vincent Palatin         <vincent.palatin@m4x.org>
 

diff --git a/ChangeLog b/ChangeLog
index 9df6514..17e5fb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@ Bug/Wish:
         - #663: Link to Xnet's map from the "My groups" page               -FRU
         - #689: Edit my profile from Xnet                                  -FRU
 
+    * Xnet:
+        - #694: Color of 'Promotion' groups                                -ALK
+
 From 0.9.14 branch:
 
     * Payment:
@@ -1038,7 +1041,8 @@ ACRONYMS:
 
     * PoT: Polytechnique.org TEAM (see Authors).
 
-    * BOB: Damien Bobillot      (Schmurtz)  <damien.bobillot@m4x.org> 
+    * ALK: Olivier Le Floch     (Alakazam)  <olivier.le-floch@m4x.org>
+    * BOB: Damien Bobillot      (Schmurtz)  <damien.bobillot@m4x.org>
     * Car: Pascal Corpet        (Caribou)   <pascal.corpet@m4x.org>
     * CAT: Florian El Ahdab     (LeChat)    <florian.el-ahdab@m4x.org>
     * FAL: Raphaël Marichez     (Falco)     <raphael.marichez@m4x.org>

diff --git a/modules/banana.php b/modules/banana.php
index 8193a43..d5c51ef 100644 (file)
--- a/modules/banana.php
+++ b/modules/banana.php
@@ -36,11 +36,11 @@ class BananaModule extends PLModule
         $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements');
         $p_for = "xorg.promo.x$promo";
 
-        // rÃ\83©cupÃ\83©ration de l'id du forum promo
+        // récupération de l'id du forum promo
         $res = XDB::query("SELECT fid FROM forums.list WHERE nom={?}", $p_for);
         if ($res->numRows()) {
             $cible[] = $p_for;
-        } else { // pas de forum promo, il faut le crÃ\83©er
+        } else { // pas de forum promo, il faut le créer
             $res = XDB::query("SELECT  SUM(perms IN ('admin','user') AND deces=0),COUNT(*)
                                  FROM  auth_user_md5 WHERE promo={?}", $promo);
             list($effau, $effid) = $res->fetchOneRow();