X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fbanana%2Fhooks.inc.php;h=db23f72cc39ae59c6e47c8f13e8676de98ff512e;hb=e603b9c344f281b7d8da1a169d4122a82b5dd966;hp=82334eadeb0dff6f620f874c29cb71fdb7c6e966;hpb=353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6;p=platal.git

diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php
index 82334ea..db23f72 100644
--- a/include/banana/hooks.inc.php
+++ b/include/banana/hooks.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,7 +19,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/message.func.inc.php';
 
 function hook_formatDisplayHeader($_header, $_text, $in_spool = false)
 {
@@ -76,7 +77,7 @@ function hook_platalRSS($group)
     } else {
         $group = '';
     }
-    return '/rss/' . $group . S::v('hruid') . '/' . S::s('token') . '/rss.xml';
+    return '/rss/' . $group . S::v('hruid') . '/' . S::user()->token . '/rss.xml';
 }
 
 function hook_platalMessageLink($params)
@@ -306,7 +307,7 @@ class PlatalBananaPage extends BananaPage
 
 class BananaHandler
 {
-    public function __construct(PlWizard &$wiz)
+    public function __construct(PlWizard $wiz)
     {
     }
 
@@ -315,7 +316,7 @@ class BananaHandler
         return 'banana/index.tpl';
     }
 
-    public function prepare(PlPage &$page, $id)
+    public function prepare(PlPage $page, $id)
     {
     }
 
@@ -327,7 +328,7 @@ class BananaHandler
     }
 }
 
-function run_banana(&$page, $class, array $args)
+function run_banana($page, $class, array $args)
 {
     $user = S::user();
     $banana = new $class($user, $args);