Changeset 1655 for trunk/gregarius/cls

Timestamp:

01/06/07 23:01:06 (20 months ago)

Author:

mbonetti

Message:

experimental fix for #302

Files:

• trunk/gregarius/cls/channels.php (modified) (3 diffs)

trunk/gregarius/cls/channels.php

@@ -142 +142 @@
     }
     
-    function render() {     
-        $GLOBALS['rss']->currentFeedsFolder = $this;
-        eval($GLOBALS['rss'] ->getCachedTemplateFile("feedsfolder.php"));
+    function render() {
+        if ((!getConfig('rss.output.minimalchannellist')) || ($this->feeds)) { 
+            $GLOBALS['rss']->currentFeedsFolder = $this; 
+            require($GLOBALS['rss'] ->getTemplateFile("feedsfolder.php")); 
+        }
     }
 }
@@ -213 +215 @@
                // Lets collapse all folders
                $res = rss_query("select id from " . getTable('folders') . " where id != 0");
-               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {
-               }
+               while (list ($this->collapsed_ids[]) = rss_fetch_row($res)) {}
                if (!headers_sent()) { // Sajax does not allow us to set cookies
                 setcookie(COLLAPSED_FOLDERS_COOKIE, 
@@ -287 +288 @@
                 $this->folders[$cparent] = new FeedFolder($fname, $cparent,$this);
             }
-            $this->folders[$cparent]->feeds[] = $f;
+            //$this->folders[$cparent]->feeds[] = $f;
+            if(($ucc != 0) || (!getConfig('rss.output.minimalchannellist'))) { 
+                $this->folders[$cparent]->feeds[] = $f; 
+            }
             $this->folders[$cparent]->isCollapsed = in_array($cparent, $this->collapsed_ids) && ($cparent > 0);