[phpwiki-checkins] CVS: phpwiki/themes/MonoBook/templates actionbar.tmpl, 1.11, 1.12

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MonoBook/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7902/themes/MonoBook/templates

Modified Files:
	actionbar.tmpl 
Log Message:
Change edit/viewsource logic to ACL

Index: actionbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MonoBook/templates/actionbar.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -2 -b -p -d -r1.11 -r1.12
--- actionbar.tmpl	2 Jan 2007 13:29:59 -0000	1.11
+++ actionbar.tmpl	7 Jan 2007 20:19:56 -0000	1.12
@@ -6,6 +6,4 @@ $isActionPage = $request->isActionPage($
 $isAdmin = $user->isAdmin();
 $pagename = $page->getName();
-/*if (empty($revision))
-  $revision = $page->getCurrentRevision(false);*/
 ?>
 <div class="portlet" id="p-cactions">
@@ -31,5 +29,5 @@ $pagename = $page->getName();
       <?= ActionButton(array(),_("Discussion"), $talk->getParent(), array('class'=>"selected")) ?>
     <?php } ?>
-    <?php if ((!$page->get('locked') || $isAdmin) and !$revision) { ?>
+    <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?>
       <?= ActionButton("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?>
     <?php } else { ?>