| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -2264,11 +2264,7 @@ |
| 2265 | 2265 | if ( $preOpenMatch and !$preCloseMatch ) { |
| 2266 | 2266 | $this->mInPre = true; |
| 2267 | 2267 | } |
| 2268 | | - if ( $closematch ) { |
| 2269 | | - $inBlockElem = false; |
| 2270 | | - } else { |
| 2271 | | - $inBlockElem = true; |
| 2272 | | - } |
| | 2268 | + $inBlockElem = !$closematch; |
| 2273 | 2269 | } elseif ( !$inBlockElem && !$this->mInPre ) { |
| 2274 | 2270 | if ( ' ' == substr( $t, 0, 1 ) and ( $this->mLastSection === 'pre' || trim( $t ) != '' ) ) { |
| 2275 | 2271 | # pre |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -1100,7 +1100,7 @@ |
| 1101 | 1101 | } |
| 1102 | 1102 | |
| 1103 | 1103 | static function validateSignature( $signature, $alldata ) { |
| 1104 | | - global $wgParser, $wgMaxSigChars, $wgLang; |
| | 1104 | + global $wgMaxSigChars, $wgLang; |
| 1105 | 1105 | if ( mb_strlen( $signature ) > $wgMaxSigChars ) { |
| 1106 | 1106 | return Xml::element( 'span', array( 'class' => 'error' ), |
| 1107 | 1107 | wfMsgExt( 'badsiglength', 'parsemag', |