From: Victor Vasiliev Date: Thu, 1 Jan 2009 02:03:09 +0000 (+0000) Subject: * Put restricted image moving back, with Brion's permission X-Git-Tag: 1.31.0-rc.0~43641 X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=3753eb574ebec29884002504aaf439bf189ae360;p=lhc%2Fweb%2Fwiklou.git * Put restricted image moving back, with Brion's permission --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 23676b2bb3..e2204e1ed8 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -255,6 +255,7 @@ The following extensions are migrated into MediaWiki 1.14: * Show subversion too even if a "normal" version number is available * (bug 16121) Add a note that a page move was without creating a redirect in the move log +* Image moving is now enabled for sysops by default === Bug fixes in 1.14 === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5dc785122d..695e38c28d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1163,41 +1163,42 @@ $wgEmailConfirmToEdit=false; $wgGroupPermissions = array(); // Implicit group for all visitors -$wgGroupPermissions['*' ]['createaccount'] = true; -$wgGroupPermissions['*' ]['read'] = true; -$wgGroupPermissions['*' ]['edit'] = true; -$wgGroupPermissions['*' ]['createpage'] = true; -$wgGroupPermissions['*' ]['createtalk'] = true; -$wgGroupPermissions['*' ]['writeapi'] = true; +$wgGroupPermissions['*']['createaccount'] = true; +$wgGroupPermissions['*']['read'] = true; +$wgGroupPermissions['*']['edit'] = true; +$wgGroupPermissions['*']['createpage'] = true; +$wgGroupPermissions['*']['createtalk'] = true; +$wgGroupPermissions['*']['writeapi'] = true; // Implicit group for all logged-in accounts -$wgGroupPermissions['user' ]['move'] = true; -$wgGroupPermissions['user' ]['move-subpages'] = true; -$wgGroupPermissions['user' ]['move-rootuserpages'] = true; // can move root userpages -$wgGroupPermissions['user' ]['read'] = true; -$wgGroupPermissions['user' ]['edit'] = true; -$wgGroupPermissions['user' ]['createpage'] = true; -$wgGroupPermissions['user' ]['createtalk'] = true; -$wgGroupPermissions['user' ]['writeapi'] = true; -$wgGroupPermissions['user' ]['upload'] = true; -$wgGroupPermissions['user' ]['reupload'] = true; -$wgGroupPermissions['user' ]['reupload-shared'] = true; -$wgGroupPermissions['user' ]['minoredit'] = true; -$wgGroupPermissions['user' ]['purge'] = true; // can use ?action=purge without clicking "ok" +$wgGroupPermissions['user']['move'] = true; +$wgGroupPermissions['user']['move-subpages'] = true; +$wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root userpages +//$wgGroupPermissions['user']['movefile'] = true; // Disabled for now due to possible bugs and security concerns +$wgGroupPermissions['user']['read'] = true; +$wgGroupPermissions['user']['edit'] = true; +$wgGroupPermissions['user']['createpage'] = true; +$wgGroupPermissions['user']['createtalk'] = true; +$wgGroupPermissions['user']['writeapi'] = true; +$wgGroupPermissions['user']['upload'] = true; +$wgGroupPermissions['user']['reupload'] = true; +$wgGroupPermissions['user']['reupload-shared'] = true; +$wgGroupPermissions['user']['minoredit'] = true; +$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without clicking "ok" // Implicit group for accounts that pass $wgAutoConfirmAge $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true; // Users with bot privilege can have their edits hidden // from various log pages by default -$wgGroupPermissions['bot' ]['bot'] = true; -$wgGroupPermissions['bot' ]['autoconfirmed'] = true; -$wgGroupPermissions['bot' ]['nominornewtalk'] = true; -$wgGroupPermissions['bot' ]['autopatrol'] = true; -$wgGroupPermissions['bot' ]['suppressredirect'] = true; -$wgGroupPermissions['bot' ]['apihighlimits'] = true; -$wgGroupPermissions['bot' ]['writeapi'] = true; -#$wgGroupPermissions['bot' ]['editprotected'] = true; // can edit all protected pages without cascade protection enabled +$wgGroupPermissions['bot']['bot'] = true; +$wgGroupPermissions['bot']['autoconfirmed'] = true; +$wgGroupPermissions['bot']['nominornewtalk'] = true; +$wgGroupPermissions['bot']['autopatrol'] = true; +$wgGroupPermissions['bot']['suppressredirect'] = true; +$wgGroupPermissions['bot']['apihighlimits'] = true; +$wgGroupPermissions['bot']['writeapi'] = true; +#$wgGroupPermissions['bot']['editprotected'] = true; // can edit all protected pages without cascade protection enabled // Most extra permission abilities go to this group $wgGroupPermissions['sysop']['block'] = true; @@ -1231,6 +1232,7 @@ $wgGroupPermissions['sysop']['markbotedits'] = true; $wgGroupPermissions['sysop']['apihighlimits'] = true; $wgGroupPermissions['sysop']['browsearchive'] = true; $wgGroupPermissions['sysop']['noratelimit'] = true; +$wgGroupPermissions['sysop']['movefile'] = true; #$wgGroupPermissions['sysop']['mergehistory'] = true; // Permission to change users' group assignments @@ -1668,8 +1670,8 @@ $wgAllowExternalImagesFrom = ''; */ $wgEnableImageWhitelist = true; -/** Allows to move images and other media files. Experemintal, not sure if it always works */ -$wgAllowImageMoving = false; +/** Allows to move images and other media files */ +$wgAllowImageMoving = true; /** Disable database-intensive features */ $wgMiserMode = false; diff --git a/includes/Title.php b/includes/Title.php index e6a414a816..45625a059b 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1222,6 +1222,10 @@ class Title { // Show user page-specific message only if the user can move other pages $errors[] = array( 'cant-move-user-page' ); } + // Check if user is allowed to move files if it's a file + if( $this->getNamespace() == NS_FILE && !$user->isAllowed( 'movefile' ) ) { + $errors[] = array( 'movenotallowedfile' ); + } // Check for immobile pages if( !MWNamespace::isMovable( $this->getNamespace() ) ) { // Specific message for this case diff --git a/includes/User.php b/includes/User.php index 3a0023ada7..e213a101ac 100644 --- a/includes/User.php +++ b/includes/User.php @@ -151,6 +151,7 @@ class User { 'markbotedits', 'minoredit', 'move', + 'movefile', 'move-rootuserpages', 'move-subpages', 'nominornewtalk', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 00a2d0479d..03da2742a3 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1620,6 +1620,7 @@ please see math/README to configure.', 'right-move' => 'Move pages', 'right-move-subpages' => 'Move pages with their subpages', 'right-move-rootuserpages' => 'Move root user pages', +'right-movefile' => 'Move files', 'right-suppressredirect' => 'Not create a redirect from the old name when moving a page', 'right-upload' => 'Upload files', 'right-reupload' => 'Overwrite an existing file', @@ -2690,6 +2691,7 @@ In those cases, you will have to move or merge the page manually if desired.", 'movenologin' => 'Not logged in', 'movenologintext' => 'You must be a registered user and [[Special:UserLogin|logged in]] to move a page.', 'movenotallowed' => 'You do not have permission to move pages.', +'movenotallowedfile' => 'You do not have permission to move files.', 'cant-move-user-page' => 'You do not have permission to move user pages (apart from subpages).', 'cant-move-to-user-page' => 'You do not have permission to move a page to a user page (except to a user subpage).', 'newtitle' => 'To new title:',