Fix References

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@286 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/message.inc.php b/banana/message.inc.php
index efe8f7a..8eba97a 100644 (file)
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -91,18 +91,12 @@ final class BananaMessage extends BananaMimePart
 
           case "references": case "in-reply-to":
             $rsl     = "";
-            $parents = preg_grep('/^\d+$/', $this->getTranslatedReferences());
-            $p       = array_pop($parents);
-
-            $parents = array();
-            while (!is_null($p)) {
-                array_unshift($parents, $p);
-                $p         = Banana::$spool->overview[$p]->parent;  
-            }
+            $parents = Banana::$spool->getReferences($this->headers);
             $ndx = 1;
-            foreach ($parents as $p) {
+            while (!empty($parents)) {
+                $p = array_shift($parents);
                 $rsl .= Banana::$page->makeLink(Array('group' => Banana::$spool->group,
-                                                      'artid' => $p, 'text' => $ndx++)) . ' ';
+                                                      'artid' => $p->id, 'text' => $ndx++)) . ' ';
             }
             return $rsl;
 
@@ -223,21 +217,6 @@ final class BananaMessage extends BananaMimePart
         return preg_split('/\s/', $text);
     }
 
-    public function getTranslatedReferences()
-    {
-        return BananaMessage::formatReferences($this->headers);
-    }
-
-    static public function &formatReferences(array &$refs)
-    {
-        $references = array();
-        $msgs = Banana::$spool->getReferences($refs);
-        foreach ($msgs as &$msg) {
-            $references[] = $msg->id;
-        }
-        return $references;
-    }
-
     public function hasXFace()
     {
         return Banana::$msgshow_xface &&