Changeset 1467

Timestamp:

05/11/06 16:17:09 (2 years ago)

Author:

mbonetti

Message:

quick and dirty fix for #308.

Files:

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

trunk/rss/feed.php

@@ -67 +67 @@
     }
     // hide deprecated
-    $sql .= " and not(mode & " . RSS_MODE_DELETED_STATE . ") ";
+    // mbi: don't actually: we want items of deprecated feeds to be accessible, still.
+    //$sql .= " and not(mode & " . RSS_MODE_DELETED_STATE . ") ";
 
     $res =  rss_query( $sql );
@@ -157 +158 @@
 
         $sql .=" and not(i.unread & " . RSS_MODE_DELETED_STATE  .") ";
-
         $sql .=" order by i.added desc, i.id asc";
 
@@ -181 +181 @@
         $sql = "select c.id from ". getTable('channels')." c "
                ." where c.parent=$fid and c.parent > 0";
-        $sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
+        //$sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
 
         if (hidePrivate()) {
@@ -205 +205 @@
             $sql .= "and t.tag like '$vfid'";
         }
-        $sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
+        //$sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
 
         if (hidePrivate()) {
@@ -322 +322 @@
                ." where i.unread & " .RSS_MODE_UNREAD_STATE
                ." and i.cid=$cid"
-               ." and not(i.unread & " . RSS_MODE_DELETED_STATE  .") ";
+               //." and not(i.unread & " . RSS_MODE_DELETED_STATE  .") "
+               ;
         if (hidePrivate()) {
             $sql .=" and not(i.unread & " . RSS_MODE_PRIVATE_STATE .") ";
@@ -347 +348 @@
                    . getTable('channels') . " c, "
                    . getTable('folders') . " f "
-                   . "where c.parent=f.id and not (c.mode & " . RSS_MODE_DELETED_STATE .") ";
+                   . "where c.parent=f.id "
+                   ." and not (c.mode & " . RSS_MODE_DELETED_STATE .") "
+                   ;
             if (hidePrivate()) {
                 $sql .= " and not (c.mode & " . RSS_MODE_PRIVATE_STATE . ") ";
@@ -683 +686 @@
     $res = rss_query ("select c.title, c.icon, i.title from " . getTable("channels") ." c, "
                       .getTable("item") ." i where c.id = $cid and i.cid=c.id and i.id=$iid"
-                      ." and not(i.unread & " . RSS_MODE_DELETED_STATE  .") "
+                      //." and not(i.unread & " . RSS_MODE_DELETED_STATE  .") "
                      );
 
@@ -1182 +1185 @@
                 $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") ";
             }
-            $sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
+            //$sql .= " and not(c.mode & " .  RSS_MODE_DELETED_STATE .") ";
 
             if (getConfig('rss.config.absoluteordering')) {