Changeset 1543

Timestamp:

08/23/06 22:40:42 (2 years ago)

Author:

cfriesen

Message:

I did this one a while ago, too.

Files:

• trunk/gregarius/cls/items.php (modified) (2 diffs)

trunk/gregarius/cls/items.php

@@ -288 +288 @@
             ." i.pubdate is not null as ispubdate, i.id, r.rating  ";
         $this -> _sqlActualFrom =   getTable("item") ." i "
-            ." left join "
-            . getTable("rating") ." r on (i.id = r.iid), "
-            .getTable("channels")." c, "
-            .getTable("folders") ." f ";
-
-        $this -> _sqlActualWhere = " i.cid = c.id and "
-            ." f.id=c.parent and ". (false == $includeDeprecated ? " not(c.mode & ".RSS_MODE_DELETED_STATE.") and " : "")
+            ." left join " . getTable("rating") ." r on (i.id = r.iid) "
+            ." inner join " . getTable("channels")." c on (c.id = i.cid) "
+            ." inner join " . getTable("folders") ." f on (f.id = c.parent) ";
+
+        $this -> _sqlActualWhere = (false == $includeDeprecated ? " not(c.mode & ".RSS_MODE_DELETED_STATE.") and " : "")
             ." not(i.unread & ".RSS_MODE_DELETED_STATE.") and ";
-            
-
 
         if (hidePrivate()) {
@@ -413 +409 @@
         if (count($this -> iids)) {
             // fetch the tags for the items;
-            $sql = "select t.tag,m.fid,i.cid "
-            ." from "
-            .getTable('tag')." t, "
-            .getTable('metatag')." m, "
-            .getTable('item')." i "
-            ." where m.tid = t.id and i.id=m.fid and m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")";
+            $sql = "select t.tag, m.fid, i.cid "
+            ." from " . getTable('tag')." t "
+            ." inner join " . getTable('metatag') . " m "
+            ."   on m.tid = t.id "
+            ." inner join " . getTable('item')." i "
+            ."   on i.id = m.fid "
+            ." where m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")";
             
             $res = $GLOBALS['rss_db']->rss_query($sql);