From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Sun, 28 Oct 2007 16:52:21 +0000 (+0000)
Subject: Fix msg-id references.
X-Git-Tag: 1.8~22
X-Git-Url: http://git.polytechnique.org/?p=banana.git;a=commitdiff_plain;h=4769d001ccbeda28e61fc49240b629e348de03cb

Fix msg-id references.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@289 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---

diff --git a/banana/message.func.inc.php b/banana/message.func.inc.php
index 3b00c9c..31f3e47 100644
--- a/banana/message.func.inc.php
+++ b/banana/message.func.inc.php
@@ -140,7 +140,7 @@ function banana__catchMailLink($email)
     $mid = '<' . $email . '>';
     if (isset(Banana::$spool->ids[$mid])) {
         return Banana::$page->makeLink(Array('group' => Banana::$group,
-                                             'artid' => Banana::$spool->ids[$mid],
+                                             'artid' => Banana::$spool->ids[$mid]->id,
                                              'text'  => $email));
     } elseif (strpos($email, '$') !== false) {
         return $email;
diff --git a/banana/mimepart.inc.php b/banana/mimepart.inc.php
index ed7080f..6b0f399 100644
--- a/banana/mimepart.inc.php
+++ b/banana/mimepart.inc.php
@@ -337,7 +337,7 @@ class BananaMimePart
         }
 
         if (!is_null($this->charset)) {
-            $body = iconv($this->charset, 'UTF-8//IGNORE', $this->body);
+            $body = @iconv($this->charset, 'UTF-8//IGNORE', $this->body);
             if (empty($body)) {
                 return;
             }
diff --git a/banana/nntpcore.inc.php b/banana/nntpcore.inc.php
index b6170b8..4b8e9c0 100644
--- a/banana/nntpcore.inc.php
+++ b/banana/nntpcore.inc.php
@@ -466,7 +466,7 @@ class BananaNNTPCore
         $array  =& $this->fetchResult();
         $groups = array();
         foreach ($array as &$result) {
-            list($group, $desc) = split("[ \t]", $result, 2);
+            @list($group, $desc) = split("[ \t]", $result, 2);
             $groups[$group] = $desc;
         }
         return $groups;