Merge "Moved onArticleEdit() lines around for clarity"

diff --combined includes/page/WikiPage.php
index 069896c,ef3dc93..657c4d0
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1199,9 -1199,10 +1199,9 @@@ class WikiPage implements Page, IDBAcce
         * Best if all done inside a transaction.
         *
         * @param DatabaseBase $dbw
 -       * @return int The newly created page_id key, or false if the title already existed
 +       * @return int|bool The newly created page_id key; false if the title already existed
         */
        public function insertOn( $dbw ) {
 -
                $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
                $dbw->insert( 'page', array(
                        'page_id'           => $page_id,
@@@ -1222,11 -1223,9 +1222,11 @@@
                        $newid = $dbw->insertId();
                        $this->mId = $newid;
                        $this->mTitle->resetArticleID( $newid );
 -              }
  
 -              return $affected ? $newid : false;
 +                      return $newid;
 +              } else {
 +                      return false;
 +              }
        }
  
        /**
@@@ -3225,10 -3224,10 +3225,10 @@@
  
                // Purge squid for this page only
                $title->purgeSquid();
- 
-               $revid = $revision ? $revision->getId() : null;
                // Clear file cache for this page only
                HTMLFileCache::clearFileCache( $title );
+ 
+               $revid = $revision ? $revision->getId() : null;
                DeferredUpdates::addCallableUpdate( function() use ( $title, $revid ) {
                        InfoAction::invalidateCache( $title, $revid );
                } );