http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72240

Revision: 72240
Author:   reedy
Date:     2010-09-02 23:12:47 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
Remove unused global

Simplify some logic

Modified Paths:
--------------
    trunk/phase3/includes/Preferences.php
    trunk/phase3/includes/parser/Parser.php

Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php       2010-09-02 22:20:00 UTC (rev 
72239)
+++ trunk/phase3/includes/Preferences.php       2010-09-02 23:12:47 UTC (rev 
72240)
@@ -1100,7 +1100,7 @@
        }
 
        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',

Modified: trunk/phase3/includes/parser/Parser.php
===================================================================
--- trunk/phase3/includes/parser/Parser.php     2010-09-02 22:20:00 UTC (rev 
72239)
+++ trunk/phase3/includes/parser/Parser.php     2010-09-02 23:12:47 UTC (rev 
72240)
@@ -2264,11 +2264,7 @@
                                        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



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to