Changeset 1604 for branches/multiuser/opml.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/opml.php (modified) (5 diffs)

branches/multiuser/opml.php

@@ -49 +49 @@
 
     global $blogs,$folder,$inOpmlfolder, $inOpmlItem;
-    $folder = LBL_HOME_FOLDER;
+    $folder = __('Root');
     
     $inOpmlfolder = $inOpmlItem = false;
@@ -102 +102 @@
             // end of folder element!
             $inOpmlfolder = false;
-            $folder = LBL_HOME_FOLDER;
+            $folder = __('Root');
         } else {
             // end of item element
@@ -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)) {
@@ -134 +134 @@
     
 
-    $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";
-      
-      
+    $sql = "select c.id, c.title, c.url, c.siteurl, d.name, c.parent, c.descr "
+      ." 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 +149 @@
         $sql .=" order by d.name asc, c.title asc";
     }
-    
-    
-    
     
     $res = rss_query($sql);