[php-blog-cvs] serendipity/include/admin category.inc.php,1.4,1.5

[Tom S. <tom...@us...>]

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

Modified Files:
	category.inc.php 
Log Message:
- Use serendipity_walkRecursive()


Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- category.inc.php	15 Dec 2004 19:50:28 -0000	1.4
+++ category.inc.php	23 Dec 2004 01:51:19 -0000	1.5
@@ -151,13 +151,15 @@
             <select id="parent_cat" name="serendipity[cat][parent_cat]">
                 <option value="0"<?php if ( (int)$serendipity['GET']['cid'] == 0 ) echo ' selected="selected"'; ?>>[ <?php echo NO_CATEGORY; ?> ]</option>
 <?php
-        $cats = serendipity_fetchCategories('all');
-        foreach ( $cats as $cat ) {
-            if ( $cat['categoryid'] == (int)$serendipity['GET']['cid'] ) {
-                $parentid = $cat['parentid'];
+        $categories = serendipity_fetchCategories('all');
+        $categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED);
+        foreach ( $categories as $cat ) {
+            /* We can't be our own parent, the universe will collapse */
+            if ( $cat['categoryid'] == $serendipity['GET']['cid'] ) {
+                continue;
             }
+            echo '<option value="'. $cat['categoryid'] .'"'. ($this_cat['parentid'] == $cat['categoryid'] ? ' selected="selected"' : '') .'>'. str_repeat('&nbsp;', $cat['depth']) . $cat['category_name'] .'</option>' . "\n";
         }
-       echo serendipity_generateCategoryList($cats, array($parentid), 2);
 ?>
             </select>
         </td>