[Tikiwiki-cvs] tiki/lib tikilib.php,1.497,1.498

[<te...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14613/lib

Modified Files:
	tikilib.php 
Log Message:
fixed major bug: $tiki_p_view_categories should only be checked if an object is actually categorized.  thx rlpowell!

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -d -r1.497 -r1.498
--- tikilib.php	14 Jun 2004 19:23:38 -0000	1.497
+++ tikilib.php	14 Jun 2004 20:07:14 -0000	1.498
@@ -526,12 +526,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'quiz', $res['quizId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -627,12 +630,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'tracker', $res['trackerId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -691,12 +697,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'survey', $res['surveyId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -1210,12 +1219,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'faq', $res['faqId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -2301,12 +2313,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'blog', $res['blogId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -2481,12 +2496,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'article', $res['articleId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }
@@ -3239,12 +3257,15 @@
 	    	unset($tiki_p_view_categories); // unset this var in case it was set previously
 	    	$perms_array = $categlib->get_object_categories_perms($user, 'image gallery', $res['galleryId']);
 	    	if ($perms_array) {
+	    		$is_categorized = TRUE;
 		    	foreach ($perms_array as $perm => $value) {
 		    		$$perm = $value;
 		    	}
+	    	} else {
+	    		$is_categorized = FALSE;
 	    	}
 
-	    	if (isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+	    	if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
 	    		$add = FALSE;
 	    	}
 	    }