| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1142,7 +1142,9 @@ |
| 1143 | 1143 | $text="== {$summary} ==\n\n".$text; |
| 1144 | 1144 | } |
| 1145 | 1145 | $text = $this->preSaveTransform( $text ); |
| 1146 | | - $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0; |
| | 1146 | + |
| | 1147 | + /* Silently ignore minoredit if not allowed */ |
| | 1148 | + $isminor = $isminor && $wgUser->isAllowed('minoredit'); |
| 1147 | 1149 | $now = wfTimestampNow(); |
| 1148 | 1150 | |
| 1149 | 1151 | $dbw =& wfGetDB( DB_MASTER ); |
| — | — | @@ -1322,11 +1324,11 @@ |
| 1323 | 1325 | return false; |
| 1324 | 1326 | } |
| 1325 | 1327 | |
| 1326 | | - $isminor = ( $minor && $wgUser->isLoggedIn() ); |
| | 1328 | + $isminor = $minor && $wgUser->isAllowed('minoredit'); |
| 1327 | 1329 | if ( $this->isRedirect( $text ) ) { |
| 1328 | 1330 | $redir = 1; |
| 1329 | | - } else { |
| 1330 | | - $redir = 0; |
| | 1331 | + } else { |
| | 1332 | + $redir = 0; |
| 1331 | 1333 | } |
| 1332 | 1334 | |
| 1333 | 1335 | $text = $this->preSaveTransform( $text ); |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -665,7 +665,7 @@ |
| 666 | 666 | * near the top, for captchas and the like. |
| 667 | 667 | */ |
| 668 | 668 | function showEditForm( $formCallback=null ) { |
| 669 | | - global $wgOut, $wgUser, $wgAllowAnonymousMinor, $wgLang, $wgContLang; |
| | 669 | + global $wgOut, $wgUser, $wgLang, $wgContLang; |
| 670 | 670 | |
| 671 | 671 | $fname = 'EditPage::showEditForm'; |
| 672 | 672 | wfProfileIn( $fname ); |
| — | — | @@ -784,7 +784,7 @@ |
| 785 | 785 | |
| 786 | 786 | $minoredithtml = ''; |
| 787 | 787 | |
| 788 | | - if ( $wgUser->isLoggedIn() || $wgAllowAnonymousMinor ) { |
| | 788 | + if ( $wgUser->isAllowed('minoredit') ) { |
| 789 | 789 | $minoredithtml = |
| 790 | 790 | "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":""). |
| 791 | 791 | " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />". |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -730,7 +730,6 @@ |
| 731 | 731 | $wgHitcounterUpdateFreq = 1; |
| 732 | 732 | |
| 733 | 733 | # Basic user rights and block settings |
| 734 | | -$wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'minor' |
| 735 | 734 | $wgSysopUserBans = true; # Allow sysops to ban logged-in users |
| 736 | 735 | $wgSysopRangeBans = true; # Allow sysops to ban IP ranges |
| 737 | 736 | $wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire |
| — | — | @@ -776,6 +775,7 @@ |
| 777 | 776 | $wgGroupPermissions['user' ]['upload'] = true; |
| 778 | 777 | $wgGroupPermissions['user' ]['reupload'] = true; |
| 779 | 778 | $wgGroupPermissions['user' ]['reupload-shared'] = true; |
| | 779 | +$wgGroupPermissions['user' ]['minoredit'] = true; |
| 780 | 780 | |
| 781 | 781 | // Implicit group for accounts that pass $wgAutoConfirmAge |
| 782 | 782 | $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -395,7 +395,9 @@ |
| 396 | 396 | * (bug 714) "plainlinks" class issues in IE, Opera |
| 397 | 397 | * (bug 4317) Inconsistent "broken redirects" messages |
| 398 | 398 | * Default interface text for "selflinks" tweaked |
| | 399 | +* Removed broken wgAllowAnonymousMinor and added new group right minoredit |
| 399 | 400 | |
| | 401 | + |
| 400 | 402 | === Caveats === |
| 401 | 403 | |
| 402 | 404 | Some output, particularly involving user-supplied inline HTML, may not |