Changeset 854

Timestamp:

09/05/05 09:54:25 (3 years ago)

Author:

mbonetti

Message:

ok, should be fine. This fixes #136 and #107 (I think?)

Files:

• trunk/rss/feed.php (modified) (4 diffs)

trunk/rss/feed.php

@@ -272 +272 @@
         case  'LBL_MARK_CHANNEL_READ':
          
-            $first_unread_id=$next_unread_id='';
+        /** mark channel as read **/
+        $sql = "update " .getTable("item")
+            ." set unread = unread & ".SET_MODE_READ_STATE." where cid=$cid";
+        if (hidePrivate()) {
+            $sql .= " and not(unread & " . FEED_MODE_PRIVATE_STATE . ")";
+        }
+        if (count($IdsToMarkAsRead)) {
+            $sql .= " and id in (" . implode(',',$IdsToMarkAsRead) .")";
+        }
+        rss_query($sql);
+
+
+        /** see where we should redirect **/
+        $first_unread_id=$next_unread_id='';
          
          // redirect to the next unread, if any.
@@ -295 +308 @@
          $next_ok=false;
          while(list ($unread_id) = rss_fetch_row($res)) {
-            if ($first_unread_id == '' && $unread_id != $cid) {
+            if ($first_unread_id == '') {
                 $first_unread_id = $unread_id;
             }
@@ -305 +318 @@
             
             if ($unread_id == $cid) {
-                $next_ok=true;
+                $next_unread_id=$unread_id;
+                break;
             }
          }
@@ -312 +326 @@
          }
          
-         $sql = "update " .getTable("item") ." set unread = unread & ".SET_MODE_READ_STATE." where cid=$cid";
-         
-         
-        if (hidePrivate()) {
-            $sql .= " and not(unread & " . FEED_MODE_PRIVATE_STATE . ")";
-        }
-        if (count($IdsToMarkAsRead)) {
-            $sql .= " and id in (" . implode(',',$IdsToMarkAsRead) .")";
-        }
-         
-         rss_query($sql);
+
          
          //redirect