Some fixes

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

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index f4b19b0..2bab28c 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -456,6 +456,10 @@ class Banana
             if ($group == @$_SESSION['banana_group'] && isset($_SESSION['banana_spool'])) {
                 Banana::$spool = unserialize($_SESSION['banana_spool']);
                 $clean = @(Banana::$profile['lastnews'] != $_SESSION['banana_lastnews']);
+            } else {
+                unset($_SESSION['banana_message']);
+                unset($_SESSION['banana_artid']);
+                unset($_SESSION['banana_showhdr']);
             }
             BananaSpool::getSpool($group, Banana::$profile['lastnews'], Banana::$profile['autoup'] || $clean);
             $_SESSION['banana_group'] = $group;

diff --git a/banana/mbox.inc.php b/banana/mbox.inc.php
index a5bfdc7..f14fbee 100644 (file)
--- a/banana/mbox.inc.php
+++ b/banana/mbox.inc.php
@@ -444,7 +444,7 @@ class BananaMBox implements BananaProtocoleInterface
             }
             if ($id != $this->current_id || !$this->at_beginning) {
                 if (!$this->goTo($id)) {
-                    continue;
+                    break;
                 }
             }
             $beginning = ftell($this->file);