Backport r1811

Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 254f839..d352a74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ================================================================================
+VERSION 0.9.15                                                        XX XX 2007
+
+From 0.9.14 branch:
+
+    * Payment:
+        - #662: Fix the attribution of the payments                        -BOB
+
+================================================================================
 VERSION 0.9.14                                                        27 04 2007
 
 New:
@@ -1010,6 +1018,7 @@ ACRONYMS:
 
     * PoT: Polytechnique.org TEAM (see Authors).
 
+    * 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/classes/platalpage.php b/classes/platalpage.php
index 57e112f..31ab6d7 100644 (file)
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -117,7 +117,7 @@ abstract class PlatalPage extends Smarty
 
           case SKINNED:
            $this->register_modifier('escape_html', 'escape_html');
-               $this->default_modifiers = Array('@escape_html');
+           $this->default_modifiers = Array('@escape_html');
         }
         $this->register_outputfilter('hide_emails');
         $this->addJsLink('wiki.js');

diff --git a/modules/search.php b/modules/search.php
index 74228be..e7a2a9d 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -134,7 +134,7 @@ class SearchModule extends PLModule
             $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
             $view->addMod('minifiche', 'Minifiches', true);
             $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
-            $view->addMod('geoloc', 'Planishpère');
+            $view->addMod('geoloc', 'Planisphère');
             $view->apply('search/adv', $page, $action, $subaction);
             
             if ($subaction) {