[Tikiwiki-cvs] tiki tiki-blog_post.php,1.44,1.45

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

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

Modified Files:
	tiki-blog_post.php 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: tiki-blog_post.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-blog_post.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- tiki-blog_post.php	12 Apr 2006 20:39:29 -0000	1.44
+++ tiki-blog_post.php	13 Apr 2006 15:48:59 -0000	1.45
@@ -81,7 +81,7 @@
 	}
 
 	if ($data["user"] != $user || !$user) {
-		if ($tiki_p_blog_admin != 'y') {
+		if ($tiki_p_blog_admin != 'y' && !$tikilib->user_has_perm_on_object($user, $_REQUEST['blogId'], 'blog', 'tiki_p_blog_admin')) {
 			$smarty->assign('msg', tra("Permission denied you cannot edit this post"));
 
 			$smarty->display("error.tpl");