X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmessage.inc.php;h=8eba97a4fae7aaa9839ca143232fbf76b9523393;hb=2cd25d868a85eab32cac5d19f3f2c08778075ba4;hp=efe8f7a832ddf357c2c663e9d007fedf5e85a1f2;hpb=190f587f8ee3cbf9fc27bba3df3095305780c793;p=banana.git diff --git a/banana/message.inc.php b/banana/message.inc.php index efe8f7a..8eba97a 100644 --- 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 &&