Changeset 1473

Timestamp:

05/16/06 04:52:34 (2 years ago)

Author:

sdcosta

Message:

Removing some stuff from [1467] and [1468] in order to fix #408 about deprecated items showing up when they are not suppossed to.

Files:

• trunk/gregarius/feed.php (modified) (9 diffs)

trunk/gregarius/feed.php

@@ -66 +66 @@
         $sql .=" and not(mode & " . RSS_MODE_PRIVATE_STATE .") ";
     }
-    // hide deprecated
-    // mbi: don't actually: we want items of deprecated feeds to be accessible, still.
-    //$sql .= " and not(mode & " . RSS_MODE_DELETED_STATE . ") ";
+    // don't hide deprecated items becuase we want items of deprecated feeds to be accessible
+    // $sql .= " and not(mode & " . RSS_MODE_DELETED_STATE . ") ";
 
     $res =  rss_query( $sql );
@@ -85 +84 @@
             $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 .") ";
 
         $res = rss_query( $sql );
@@ -104 +103 @@
                 $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 .") ";
 
             $res = rss_query( $sql );
@@ -157 +156 @@
         }
 
-        //$sql .=" and not(i.unread & " . RSS_MODE_DELETED_STATE  .") ";
+        $sql .=" and not(i.unread & " . RSS_MODE_DELETED_STATE  .") ";
         $sql .=" order by i.added desc, i.id asc";
 
@@ -181 +180 @@
         $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 +204 @@
             $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 +321 @@
                ." 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()) {
@@ -686 +685 @@
     $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  .") "
                      );
 
@@ -1185 +1184 @@
                 $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')) {