Index: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php (revision 12358)
+++ trunk/phase3/includes/Article.php (revision 12359)
@@ -1142,7 +1142,9 @@
$text="== {$summary} ==\n\n".$text;
}
$text = $this->preSaveTransform( $text );
- $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+
+ /* Silently ignore minoredit if not allowed */
+ $isminor = $isminor && $wgUser->isAllowed('minoredit');
$now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
@@ -1322,11 +1324,11 @@
return false;
}
- $isminor = ( $minor && $wgUser->isLoggedIn() );
+ $isminor = $minor && $wgUser->isAllowed('minoredit');
if ( $this->isRedirect( $text ) ) {
$redir = 1;
- } else {
- $redir = 0;
+ } else {
+ $redir = 0;
}
$text = $this->preSaveTransform( $text );
Index: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php (revision 12358)
+++ trunk/phase3/includes/EditPage.php (revision 12359)
@@ -665,7 +665,7 @@
* near the top, for captchas and the like.
*/
function showEditForm( $formCallback=null ) {
- global $wgOut, $wgUser, $wgAllowAnonymousMinor, $wgLang, $wgContLang;
+ global $wgOut, $wgUser, $wgLang, $wgContLang;
$fname = 'EditPage::showEditForm';
wfProfileIn( $fname );
@@ -784,7 +784,7 @@
$minoredithtml = '';
- if ( $wgUser->isLoggedIn() || $wgAllowAnonymousMinor ) {
+ if ( $wgUser->isAllowed('minoredit') ) {
$minoredithtml =
"<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
" accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php (revision 12358)
+++ trunk/phase3/includes/DefaultSettings.php (revision 12359)
@@ -730,7 +730,6 @@
$wgHitcounterUpdateFreq = 1;
# Basic user rights and block settings
-$wgAllowAnonymousMinor = false; # Allow anonymous users to mark changes as 'minor'
$wgSysopUserBans = true; # Allow sysops to ban logged-in users
$wgSysopRangeBans = true; # Allow sysops to ban IP ranges
$wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire
@@ -776,6 +775,7 @@
$wgGroupPermissions['user' ]['upload'] = true;
$wgGroupPermissions['user' ]['reupload'] = true;
$wgGroupPermissions['user' ]['reupload-shared'] = true;
+$wgGroupPermissions['user' ]['minoredit'] = true;
// Implicit group for accounts that pass $wgAutoConfirmAge
$wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES (revision 12358)
+++ trunk/phase3/RELEASE-NOTES (revision 12359)
@@ -395,7 +395,9 @@
* (bug 714) "plainlinks" class issues in IE, Opera
* (bug 4317) Inconsistent "broken redirects" messages
* Default interface text for "selflinks" tweaked
+* Removed broken wgAllowAnonymousMinor and added new group right minoredit
+
=== Caveats ===
Some output, particularly involving user-supplied inline HTML, may not
