| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -622,10 +622,12 @@ |
| 623 | 623 | $this->watchthis = $request->getCheck( 'wpWatchthis' ); |
| 624 | 624 | |
| 625 | 625 | # Don't force edit summaries when a user is editing their own user or talk page |
| 626 | | - if ( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) { |
| | 626 | + if ( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && |
| | 627 | + $this->mTitle->getText() == $wgUser->getName() ) |
| | 628 | + { |
| 627 | 629 | $this->allowBlankSummary = true; |
| 628 | 630 | } else { |
| 629 | | - $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ); |
| | 631 | + $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ) || !$wgUser->getOption( 'forceeditsummary'); |
| 630 | 632 | } |
| 631 | 633 | |
| 632 | 634 | $this->autoSumm = $request->getText( 'wpAutoSummary' ); |
| — | — | @@ -950,11 +952,9 @@ |
| 951 | 953 | } |
| 952 | 954 | |
| 953 | 955 | # Handle the user preference to force summaries here, but not for null edits |
| 954 | | - if ( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary') && |
| 955 | | - 0 != strcmp($oldtext, $text) && |
| | 956 | + if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp($oldtext, $text) && |
| 956 | 957 | !is_object( Title::newFromRedirect( $text ) ) # check if it's not a redirect |
| 957 | 958 | ) { |
| 958 | | - |
| 959 | 959 | if ( md5( $this->summary ) == $this->autoSumm ) { |
| 960 | 960 | $this->missingSummary = true; |
| 961 | 961 | wfProfileOut( $fname ); |
| — | — | @@ -963,7 +963,7 @@ |
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | # And a similar thing for new sections |
| 967 | | - if ( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) { |
| | 967 | + if ( $this->section == 'new' && !$this->allowBlankSummary ) { |
| 968 | 968 | if (trim($this->summary) == '') { |
| 969 | 969 | $this->missingSummary = true; |
| 970 | 970 | wfProfileOut( $fname ); |