| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -539,9 +539,9 @@ |
| 540 | 540 | # whitespace from the text boxes. This may be significant formatting. |
| 541 | 541 | $this->textbox1 = $this->safeUnicodeInput( $request, 'wpTextbox1' ); |
| 542 | 542 | $this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' ); |
| 543 | | - $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); |
| | 543 | + $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); |
| 544 | 544 | # Truncate for whole multibyte characters. +5 bytes for ellipsis |
| 545 | | - $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 ); |
| | 545 | + $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 ); |
| 546 | 546 | |
| 547 | 547 | # Remove extra headings and whitespace from summaries and new sections. |
| 548 | 548 | $this->summary = trim(preg_replace('/^=+(.*?)=+$/', '$1', trim($this->summary))); |
| — | — | @@ -581,7 +581,7 @@ |
| 582 | 582 | $this->preview = true; |
| 583 | 583 | } |
| 584 | 584 | } |
| 585 | | - $this->save = ! ( $this->preview OR $this->diff ); |
| | 585 | + $this->save = !$this->preview && !$this->diff; |
| 586 | 586 | if( !preg_match( '/^\d{14}$/', $this->edittime )) { |
| 587 | 587 | $this->edittime = null; |
| 588 | 588 | } |
| — | — | @@ -924,7 +924,7 @@ |
| 925 | 925 | } |
| 926 | 926 | } |
| 927 | 927 | |
| 928 | | - #And a similar thing for new sections |
| | 928 | + # And a similar thing for new sections |
| 929 | 929 | if( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) { |
| 930 | 930 | if (trim($this->summary) == '') { |
| 931 | 931 | $this->missingSummary = true; |