Changeset 1604 for branches/multiuser/api.php

Timestamp:

10/16/06 06:31:35 (2 years ago)

Author:

mdodoo

Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Files:

• branches/multiuser/api.php (modified) (2 diffs)

branches/multiuser/api.php

@@ -66 +66 @@
     $sql = "select "
            ." c.id, c.title, c.url, c.siteurl, f.name "
-           ." from ".getTable("channels")." c, "
-           .getTable("folders")." f "." where f.id = c.parent";
+           ." from ".getTable("channels")." c "
+           . " inner join " . getTable("folders")." f on f.id = c.parent";
 
     if (hidePrivate()) {
@@ -135 +135 @@
            ." c.descr as cdescr, c.url as curl, i.author as iauth, i.url as iurl, "
            ." unix_timestamp(ifnull(i.pubdate, i.added)) as idate ,i.id as iid"
-           ." from ".getTable('item')." i, ".getTable('channels') ." c "
-           ." where i.cid=c.id and i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
+           ." from ".getTable('item')." i "
+           . " inner join ".getTable('channels') ." c "
+           ." on i.cid=c.id where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
 
     if ($date) {