[phpwiki-checkins] SF.net SVN: phpwiki:[6294] trunk/lib/plugin/WikiAdminSetAcl.php

[<var...@us...>]

Revision: 6294
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6294&view=rev
Author:   vargenau
Date:     2008-10-10 12:49:53 +0000 (Fri, 10 Oct 2008)

Log Message:
-----------
Revert: file was committed by mistake

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2008-10-07 16:02:56 UTC (rev 6293)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2008-10-10 12:49:53 UTC (rev 6294)
@@ -2,7 +2,6 @@
 rcs_id('$Id$');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
- Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
 
  This file is part of PhpWiki.
 
@@ -190,28 +189,21 @@
             $header->pushContent(HTML::p(_("Select the pages to change:")));
         }
 
-		if ($next_action == 'verify') {
-			$req = $request->getArgs();
-		} else {
-			$req = $request->getArgs();
-			unset($req['acl']);
-		}
-		
         $buttons = HTML::p(Button('submit:admin_setacl[acl]', $button_label, 'wikiadmin'),
                            Button('submit:admin_setacl[cancel]', _("Cancel"), 'button'));
 
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           $header,
-                          $buttons,
                           $pagelist->getContent(),
-                          HiddenInputs( $req,
+                          HiddenInputs($request->getArgs(),
                                         false,
                                         array('admin_setacl')),
                           HiddenInputs(array('admin_setacl[action]' => $next_action)),
                           ENABLE_PAGEPERM
                           ? ''
-                          : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
+                          : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)),
+                          $buttons);
     }
 
     function setaclForm(&$header, $post_args, $pagehash) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.