Revert r40251 by aaron. Broke &editintro= bug15455.

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7f3853d..de41441 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -699,7 +699,7 @@ class EditPage {
                        }
                }
 
-               if( !$this->mTitle->exists() && !$this->showCustomIntro() ) {
+               if( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
                        if( $wgUser->isLoggedIn() ) {
                                $wgOut->wrapWikiMsg( '<div class="mw-newarticletext">$1</div>', 'newarticletext' );
                        } else {
@@ -1163,15 +1163,15 @@ class EditPage {
                        if ( !$this->checkUnicodeCompliantBrowser() ) {
                                $wgOut->addWikiMsg( 'nonunicodebrowser' );
                        }
-
                        if ( isset( $this->mArticle ) && isset( $this->mArticle->mRevision ) ) {
-                               // Let sysop know that this will make private content public if saved
+                       // Let sysop know that this will make private content public if saved
+
                                if( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) {
                                        $wgOut->addWikiMsg( 'rev-deleted-text-permission' );
                                } else if( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
                                        $wgOut->addWikiMsg( 'rev-deleted-text-view' );
                                }
-                               // Let user know they are editing an old version
+
                                if( !$this->mArticle->mRevision->isCurrent() ) {
                                        $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() );
                                        $wgOut->addWikiMsg( 'editingold' );