http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82804

Revision: 82804
Author:   reedy
Date:     2011-02-25 17:29:17 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
* (bug 23819) Special:RenameUser should allow suppression of 
automatically-created redirect

Drop the post check, seems a bit redundant, and allows the stuff not to work if 
they're passed as GET parameters

Modified Paths:
--------------
    trunk/extensions/Renameuser/Renameuser.php
    trunk/extensions/Renameuser/Renameuser_body.php

Modified: trunk/extensions/Renameuser/Renameuser.php
===================================================================
--- trunk/extensions/Renameuser/Renameuser.php  2011-02-25 17:21:34 UTC (rev 
82803)
+++ trunk/extensions/Renameuser/Renameuser.php  2011-02-25 17:29:17 UTC (rev 
82804)
@@ -67,6 +67,8 @@
 /**
  * Show a log if the user has been renamed and point to the new username.
  * Don't show the log if the $oldUserName exists as a user.
+ *
+ * @param $article Article
  */
 function wfRenameUserShowLog( $article ) {
        global $wgOut;

Modified: trunk/extensions/Renameuser/Renameuser_body.php
===================================================================
--- trunk/extensions/Renameuser/Renameuser_body.php     2011-02-25 17:21:34 UTC 
(rev 82803)
+++ trunk/extensions/Renameuser/Renameuser_body.php     2011-02-25 17:29:17 UTC 
(rev 82804)
@@ -46,18 +46,10 @@
                $nun = is_object( $newusername ) ? $newusername->getText() : '';
                $token = $wgUser->editToken();
                $reason = $wgRequest->getText( 'reason' );
-               // If nothing given for these flags, assume they are checked
-               // unless this is a POST submission.
-               $move_checked = true;
-               $suppress_checked = false;
-               if ( $wgRequest->wasPosted() ) {
-                       if ( !$wgRequest->getCheck( 'movepages' ) ) {
-                               $move_checked = false;
-                       }
-                       if ( $wgRequest->getCheck( 'suppressredirect' ) ) {
-                               $suppress_checked = true;
-                       }
-               }
+
+               $move_checked = $wgRequest->getCheck( 'movepages' );
+               $suppress_checked = $wgRequest->getCheck( 'suppressredirect' );
+
                $warnings = array();
                if ( $oun && $nun && !$wgRequest->getCheck( 'confirmaction' )  
) {
                        wfRunHooks( 'RenameUserWarning', array( $oun, $nun, 
&$warnings ) );


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to