Backport 1745-1747

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

diff --git a/bin/banana.feedgen.php b/bin/banana.feedgen.php
index f1dc65a..b573adf 100755 (executable)
--- a/bin/banana.feedgen.php
+++ b/bin/banana.feedgen.php
@@ -11,6 +11,7 @@
 require_once 'connect.db.inc.php';
 require_once dirname(__FILE__).'/../include/banana/ml.inc.php';
 
+Banana::$mbox_helper = $globals->banana->mbox_helper;
 Banana::$spool_root = $globals->banana->spool_root;
 Banana::$nntp_host = "news://{$globals->banana->web_user}:{$globals->banana->web_pass}@{$globals->banana->server}:{$globals->banana->port}/";
 Banana::refreshAllFeeds(array('NNTP', 'MLArchive'));

diff --git a/bin/banana.spoolgen.php b/bin/banana.spoolgen.php
index c81ff44..598d9fd 100755 (executable)
--- a/bin/banana.spoolgen.php
+++ b/bin/banana.spoolgen.php
@@ -11,6 +11,7 @@
 require_once 'connect.db.inc.php';
 require_once dirname(__FILE__).'/../include/banana/ml.inc.php';
 
+Banana::$mbox_helper = $globals->banana->mbox_helper;
 Banana::$spool_root = $globals->banana->spool_root;
 Banana::$nntp_host = "news://{$globals->banana->web_user}:{$globals->banana->web_pass}@{$globals->banana->server}:{$globals->banana->port}/";
 Banana::createAllSpool(array('NNTP', 'MLArchive'));

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 43cfe17..3e691c1 100644 (file)
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -193,7 +193,7 @@ class Notifs
     public $_cats = Array();
     public $_data = Array();
 
-    function __concstruct($uid, $up=false)
+    function __construct($uid, $up=false)
     {
         $this->_uid = $uid;
 

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 92a44bd..fa535d8 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -50,7 +50,7 @@
     {/foreach}
     <link rel="stylesheet" type="text/css" href="css/print.css" media="print"/>
     <script type="text/javascript">
-      var platal_baseurl = "{#globals.baseurl#}/";
+      var platal_baseurl = "{$globals->baseurl}/";
     </script>
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>