[Tikiwiki-cvs] tiki tiki-read_article.php,1.43.2.10,1.43.2.11

[<sy...@us...>]

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

Modified Files:
      Tag: BRANCH-1-9
	tiki-read_article.php 
Log Message:
 a tiki_p_admin_cms must see an article with special perm category even if he has no tiki_p_view_categories

Index: tiki-read_article.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-read_article.php,v
retrieving revision 1.43.2.10
retrieving revision 1.43.2.11
diff -u -d -r1.43.2.10 -r1.43.2.11
--- tiki-read_article.php	26 Jun 2006 10:44:15 -0000	1.43.2.10
+++ tiki-read_article.php	26 Jun 2006 11:17:21 -0000	1.43.2.11
@@ -56,7 +56,7 @@
 		die;
 	}
 
-	if ($tiki_p_admin != 'y' && $userlib->object_has_one_permission($article_data["topicId"], 'topic')) {
+	if ($tiki_p_admin != 'y' && $tiki_p_admin_cms != 'y' && $userlib->object_has_one_permission($article_data["topicId"], 'topic')) {
 		if (!$userlib->object_has_permission($user, $article_data["topicId"], 'topic', 'tiki_p_topic_read')) {
 			$smarty->assign('msg', tra("Permision denied"));
 
@@ -73,7 +73,7 @@
 	   	} else {
 	   		$is_categorized = FALSE; // this var is used below
 	   	}
-		if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y') {
+		if ($is_categorized && isset($tiki_p_view_categories) && $tiki_p_view_categories != 'y' && $tiki_p_admin_cms != 'y') {
 			if (!isset($user)){
 				$smarty->assign('msg',$smarty->fetch('modules/mod-login_box.tpl'));
 				$smarty->assign('errortitle',tra("Please login"));