Fix warnings

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

diff --git a/banana/mbox.inc.php b/banana/mbox.inc.php
index c5bb9e2..93ffff5 100644 (file)
--- a/banana/mbox.inc.php
+++ b/banana/mbox.inc.php
@@ -106,12 +106,10 @@ class BananaMBox implements BananaProtocoleInterface
             }
             $id = Banana::$spool->ids[$id];
         }
-        $message = $this->readMessages(array($id));
-        if (empty($message)) {
-            $message = null;
-            return $message;
+        $messages = $this->readMessages(array($id));
+        if (!empty($messages)) {
+            $message = new BananaMessage($messages[$id]['message']);
         }
-        $message = new BananaMessage($message[$id]['message']);
         return $message;    
     }
 

diff --git a/banana/nntp.inc.php b/banana/nntp.inc.php
index 37a354f..6f5d245 100644 (file)
--- a/banana/nntp.inc.php
+++ b/banana/nntp.inc.php
@@ -103,6 +103,7 @@ class BananaNNTP extends BananaNNTPCore implements BananaProtocoleInterface
      */
     public function &getMessage($id)
     {
+        $message = null;
         if (is_numeric($id) && Banana::$group != $this->ingroup) {
             if (is_null(Banana::$spool)) {
                 $this->group(Banana::$group);
@@ -113,10 +114,9 @@ class BananaNNTP extends BananaNNTPCore implements BananaProtocoleInterface
         }
         $data = $this->article($id);
         if ($data !== false) {
-            return new BananaMessage($data);
+            $message = new BananaMessage($data);
         }
-        $data = null;
-        return $data;
+        return $message;
     }
 
     /** Return the sources of the message