[Tikiwiki-cvs] tiki tiki-index.php,1.188,1.189

[<nk...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9952

Modified Files:
	tiki-index.php 
Log Message:
[FIX] Wiki pages do not show categories (tracker item 1268) + some minor cleanup

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- tiki-index.php	11 Jul 2007 14:35:54 -0000	1.188
+++ tiki-index.php	30 Jul 2007 01:58:12 -0000	1.189
@@ -576,23 +576,20 @@
 }
 
 // Display category path or not (like {catpath()})
-if (isset($is_categorized) && $is_categorized) {
+if ($feature_categories == 'y' && $categlib->is_categorized('wiki page',$page)) {
     $smarty->assign('is_categorized','y');
-    if(isset($feature_categorypath) and $feature_categories == 'y') {
-	if ($feature_categorypath == 'y') {
-	    $cats = $categlib->get_object_categories('wiki page',$objId);
+    if ($feature_categoryobjects == 'y' || $feature_categorypath == 'y') {
+		$cats = $categlib->get_object_categories('wiki page',$page);
+    }
+	if ($feature_categorypath == 'y') {	
 	    $display_catpath = $categlib->get_categorypath($cats);
 	    $smarty->assign('display_catpath',$display_catpath);
-	}
-    }
-    // Display current category objects or not (like {category()})
-    if (isset($feature_categoryobjects) and $feature_categories == 'y') {
-	if ($feature_categoryobjects == 'y') {
-	    $catids = $categlib->get_object_categories('wiki page', $objId);
-	    $display_catobjects = $categlib->get_categoryobjects($catids);
+	}    
+    // Display current category objects or not (like {category()})    
+	if ($feature_categoryobjects == 'y') {	    
+	    $display_catobjects = $categlib->get_categoryobjects($cats);
 	    $smarty->assign('display_catobjects',$display_catobjects);
-	}
-    }
+	}    
 } else {
     $smarty->assign('is_categorized','n');
 }