Remove unused global

Simplify some logic

diff --git a/includes/Preferences.php b/includes/Preferences.php
index e8a574b..01a7041 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1100,7 +1100,7 @@ class Preferences {
        }
 
        static function validateSignature( $signature, $alldata ) {
-               global $wgParser, $wgMaxSigChars, $wgLang;
+               global $wgMaxSigChars, $wgLang;
                if ( mb_strlen( $signature ) > $wgMaxSigChars ) {
                        return Xml::element( 'span', array( 'class' => 'error' ),
                                wfMsgExt( 'badsiglength', 'parsemag',

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 388cef7..7bf14bf 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2264,11 +2264,7 @@ class Parser {
                                        if ( $preOpenMatch and !$preCloseMatch ) {
                                                $this->mInPre = true;
                                        }
-                                       if ( $closematch ) {
-                                               $inBlockElem = false;
-                                       } else {
-                                               $inBlockElem = true;
-                                       }
+                                       $inBlockElem = !$closematch;
                                } elseif ( !$inBlockElem && !$this->mInPre ) {
                                        if ( ' ' == substr( $t, 0, 1 ) and ( $this->mLastSection === 'pre' || trim( $t ) != '' ) ) {
                                                # pre