| Index: trunk/phase3/includes/User.php |
| — | — | @@ -151,6 +151,7 @@ |
| 152 | 152 | 'markbotedits', |
| 153 | 153 | 'minoredit', |
| 154 | 154 | 'move', |
| | 155 | + 'movefile', |
| 155 | 156 | 'move-rootuserpages', |
| 156 | 157 | 'move-subpages', |
| 157 | 158 | 'nominornewtalk', |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1222,6 +1222,10 @@ |
| 1223 | 1223 | // Show user page-specific message only if the user can move other pages |
| 1224 | 1224 | $errors[] = array( 'cant-move-user-page' ); |
| 1225 | 1225 | } |
| | 1226 | + // Check if user is allowed to move files if it's a file |
| | 1227 | + if( $this->getNamespace() == NS_FILE && !$user->isAllowed( 'movefile' ) ) { |
| | 1228 | + $errors[] = array( 'movenotallowedfile' ); |
| | 1229 | + } |
| 1226 | 1230 | // Check for immobile pages |
| 1227 | 1231 | if( !MWNamespace::isMovable( $this->getNamespace() ) ) { |
| 1228 | 1232 | // Specific message for this case |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1163,41 +1163,42 @@ |
| 1164 | 1164 | $wgGroupPermissions = array(); |
| 1165 | 1165 | |
| 1166 | 1166 | // Implicit group for all visitors |
| 1167 | | -$wgGroupPermissions['*' ]['createaccount'] = true; |
| 1168 | | -$wgGroupPermissions['*' ]['read'] = true; |
| 1169 | | -$wgGroupPermissions['*' ]['edit'] = true; |
| 1170 | | -$wgGroupPermissions['*' ]['createpage'] = true; |
| 1171 | | -$wgGroupPermissions['*' ]['createtalk'] = true; |
| 1172 | | -$wgGroupPermissions['*' ]['writeapi'] = true; |
| | 1167 | +$wgGroupPermissions['*']['createaccount'] = true; |
| | 1168 | +$wgGroupPermissions['*']['read'] = true; |
| | 1169 | +$wgGroupPermissions['*']['edit'] = true; |
| | 1170 | +$wgGroupPermissions['*']['createpage'] = true; |
| | 1171 | +$wgGroupPermissions['*']['createtalk'] = true; |
| | 1172 | +$wgGroupPermissions['*']['writeapi'] = true; |
| 1173 | 1173 | |
| 1174 | 1174 | // Implicit group for all logged-in accounts |
| 1175 | | -$wgGroupPermissions['user' ]['move'] = true; |
| 1176 | | -$wgGroupPermissions['user' ]['move-subpages'] = true; |
| 1177 | | -$wgGroupPermissions['user' ]['move-rootuserpages'] = true; // can move root userpages |
| 1178 | | -$wgGroupPermissions['user' ]['read'] = true; |
| 1179 | | -$wgGroupPermissions['user' ]['edit'] = true; |
| 1180 | | -$wgGroupPermissions['user' ]['createpage'] = true; |
| 1181 | | -$wgGroupPermissions['user' ]['createtalk'] = true; |
| 1182 | | -$wgGroupPermissions['user' ]['writeapi'] = true; |
| 1183 | | -$wgGroupPermissions['user' ]['upload'] = true; |
| 1184 | | -$wgGroupPermissions['user' ]['reupload'] = true; |
| 1185 | | -$wgGroupPermissions['user' ]['reupload-shared'] = true; |
| 1186 | | -$wgGroupPermissions['user' ]['minoredit'] = true; |
| 1187 | | -$wgGroupPermissions['user' ]['purge'] = true; // can use ?action=purge without clicking "ok" |
| | 1175 | +$wgGroupPermissions['user']['move'] = true; |
| | 1176 | +$wgGroupPermissions['user']['move-subpages'] = true; |
| | 1177 | +$wgGroupPermissions['user']['move-rootuserpages'] = true; // can move root userpages |
| | 1178 | +//$wgGroupPermissions['user']['movefile'] = true; // Disabled for now due to possible bugs and security concerns |
| | 1179 | +$wgGroupPermissions['user']['read'] = true; |
| | 1180 | +$wgGroupPermissions['user']['edit'] = true; |
| | 1181 | +$wgGroupPermissions['user']['createpage'] = true; |
| | 1182 | +$wgGroupPermissions['user']['createtalk'] = true; |
| | 1183 | +$wgGroupPermissions['user']['writeapi'] = true; |
| | 1184 | +$wgGroupPermissions['user']['upload'] = true; |
| | 1185 | +$wgGroupPermissions['user']['reupload'] = true; |
| | 1186 | +$wgGroupPermissions['user']['reupload-shared'] = true; |
| | 1187 | +$wgGroupPermissions['user']['minoredit'] = true; |
| | 1188 | +$wgGroupPermissions['user']['purge'] = true; // can use ?action=purge without clicking "ok" |
| 1188 | 1189 | |
| 1189 | 1190 | // Implicit group for accounts that pass $wgAutoConfirmAge |
| 1190 | 1191 | $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true; |
| 1191 | 1192 | |
| 1192 | 1193 | // Users with bot privilege can have their edits hidden |
| 1193 | 1194 | // from various log pages by default |
| 1194 | | -$wgGroupPermissions['bot' ]['bot'] = true; |
| 1195 | | -$wgGroupPermissions['bot' ]['autoconfirmed'] = true; |
| 1196 | | -$wgGroupPermissions['bot' ]['nominornewtalk'] = true; |
| 1197 | | -$wgGroupPermissions['bot' ]['autopatrol'] = true; |
| 1198 | | -$wgGroupPermissions['bot' ]['suppressredirect'] = true; |
| 1199 | | -$wgGroupPermissions['bot' ]['apihighlimits'] = true; |
| 1200 | | -$wgGroupPermissions['bot' ]['writeapi'] = true; |
| 1201 | | -#$wgGroupPermissions['bot' ]['editprotected'] = true; // can edit all protected pages without cascade protection enabled |
| | 1195 | +$wgGroupPermissions['bot']['bot'] = true; |
| | 1196 | +$wgGroupPermissions['bot']['autoconfirmed'] = true; |
| | 1197 | +$wgGroupPermissions['bot']['nominornewtalk'] = true; |
| | 1198 | +$wgGroupPermissions['bot']['autopatrol'] = true; |
| | 1199 | +$wgGroupPermissions['bot']['suppressredirect'] = true; |
| | 1200 | +$wgGroupPermissions['bot']['apihighlimits'] = true; |
| | 1201 | +$wgGroupPermissions['bot']['writeapi'] = true; |
| | 1202 | +#$wgGroupPermissions['bot']['editprotected'] = true; // can edit all protected pages without cascade protection enabled |
| 1202 | 1203 | |
| 1203 | 1204 | // Most extra permission abilities go to this group |
| 1204 | 1205 | $wgGroupPermissions['sysop']['block'] = true; |
| — | — | @@ -1231,6 +1232,7 @@ |
| 1232 | 1233 | $wgGroupPermissions['sysop']['apihighlimits'] = true; |
| 1233 | 1234 | $wgGroupPermissions['sysop']['browsearchive'] = true; |
| 1234 | 1235 | $wgGroupPermissions['sysop']['noratelimit'] = true; |
| | 1236 | +$wgGroupPermissions['sysop']['movefile'] = true; |
| 1235 | 1237 | #$wgGroupPermissions['sysop']['mergehistory'] = true; |
| 1236 | 1238 | |
| 1237 | 1239 | // Permission to change users' group assignments |
| — | — | @@ -1668,8 +1670,8 @@ |
| 1669 | 1671 | */ |
| 1670 | 1672 | $wgEnableImageWhitelist = true; |
| 1671 | 1673 | |
| 1672 | | -/** Allows to move images and other media files. Experemintal, not sure if it always works */ |
| 1673 | | -$wgAllowImageMoving = false; |
| | 1674 | +/** Allows to move images and other media files */ |
| | 1675 | +$wgAllowImageMoving = true; |
| 1674 | 1676 | |
| 1675 | 1677 | /** Disable database-intensive features */ |
| 1676 | 1678 | $wgMiserMode = false; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1620,6 +1620,7 @@ |
| 1621 | 1621 | 'right-move' => 'Move pages', |
| 1622 | 1622 | 'right-move-subpages' => 'Move pages with their subpages', |
| 1623 | 1623 | 'right-move-rootuserpages' => 'Move root user pages', |
| | 1624 | +'right-movefile' => 'Move files', |
| 1624 | 1625 | 'right-suppressredirect' => 'Not create a redirect from the old name when moving a page', |
| 1625 | 1626 | 'right-upload' => 'Upload files', |
| 1626 | 1627 | 'right-reupload' => 'Overwrite an existing file', |
| — | — | @@ -2690,6 +2691,7 @@ |
| 2691 | 2692 | 'movenologin' => 'Not logged in', |
| 2692 | 2693 | 'movenologintext' => 'You must be a registered user and [[Special:UserLogin|logged in]] to move a page.', |
| 2693 | 2694 | 'movenotallowed' => 'You do not have permission to move pages.', |
| | 2695 | +'movenotallowedfile' => 'You do not have permission to move files.', |
| 2694 | 2696 | 'cant-move-user-page' => 'You do not have permission to move user pages (apart from subpages).', |
| 2695 | 2697 | 'cant-move-to-user-page' => 'You do not have permission to move a page to a user page (except to a user subpage).', |
| 2696 | 2698 | 'newtitle' => 'To new title:', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -255,6 +255,7 @@ |
| 256 | 256 | * Show subversion too even if a "normal" version number is available |
| 257 | 257 | * (bug 16121) Add a note that a page move was without creating a redirect in the |
| 258 | 258 | move log |
| | 259 | +* Image moving is now enabled for sysops by default |
| 259 | 260 | |
| 260 | 261 | === Bug fixes in 1.14 === |
| 261 | 262 | |