Changeset 1544 for trunk/gregarius/opml.php

Timestamp:

08/24/06 01:14:02 (2 years ago)

Author:

cfriesen

Message:

Feel free to scream if this breaks something...

Files:

• trunk/gregarius/opml.php (modified) (3 diffs)

trunk/gregarius/opml.php

@@ -122 +122 @@
 if (array_key_exists('act',$_REQUEST)) {
 
-    $rs = rss_query( "select fid,tag from " .getTable('tag') 
-        ." t, " .getTable('metatag') ." mt "
-        ." where mt.tid=t.id and ttype='channel'");
+    $rs = rss_query( "select fid,tag from " .getTable('tag') ." t "
+                   ."inner join " .getTable('metatag') ." mt on mt.tid = t.id "
+                   ." where ttype='channel'");
     $cats=array();
     while(list($cid,$tag) = rss_fetch_row($rs)) {
@@ -136 +136 @@
     $sql = "select "
       ." c.id, c.title, c.url, c.siteurl, d.name, c.parent, c.descr "
-      ." from ". getTable("channels") . " c, " .getTable("folders") ." d "
-      ." where d.id = c.parent";
-      
+      ." from ". getTable("channels") . " c "
+      ." inner join " . getTable("folders") ." d on d.id = c.parent ";
       
     if (hidePrivate()) {
-        $sql .=" and not(c.mode & " . RSS_MODE_PRIVATE_STATE .") ";       
+        $sql .=" where not(c.mode & " . RSS_MODE_PRIVATE_STATE .") ";         
     }
     
@@ -151 +150 @@
         $sql .=" order by d.name asc, c.title asc";
     }
-    
-    
-    
     
     $res = rss_query($sql);