[php-blog-cvs] serendipity/include/admin/importers generic.inc.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18386/include/admin/importers

Modified Files:
	generic.inc.php 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: generic.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/generic.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generic.inc.php	19 Nov 2004 11:05:32 -0000	1.2
+++ generic.inc.php	1 Dec 2004 11:00:56 -0000	1.3
@@ -42,8 +42,10 @@
     function _getCategoryList() {
         $res = serendipity_fetchCategories('all');
         $ret = array(0 => NO_CATEGORY);
-        foreach ($res as $v) {
-            $ret[$v['categoryid']] = $v['category_name'];
+        if (is_array($res)) {
+            foreach ($res as $v) {
+                $ret[$v['categoryid']] = $v['category_name'];
+            }
         }
         return $ret;
     }