merged master

Change-Id: I4cf7b0f87cd571a6b50f66995dd9ad987a6ecdf8

diff --cc includes/Article.php
Simple merge

diff --cc includes/AutoLoader.php
Simple merge

diff --cc includes/Export.php
Simple merge

diff --cc includes/ImagePage.php
Simple merge

diff --cc includes/LinksUpdate.php
index 4b484a7,0712ac8..57a9ed9
--- 1/includes/LinksUpdate.php
--- 2/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@@ -63,10 -65,12 +63,14 @@@ class LinksUpdate extends SqlDataUpdat
  
                $this->mTitle = $title;
                $this->mId = $title->getArticleID();
 +              assert( $this->mId > 0 );
  
+               if ( !$this->mId ) {
+                       throw new MWException( "The Title object did not provide an article ID. Perhaps the page doesn't exist?" );
+               }
+ 
                $this->mParserOutput = $parserOutput;
 +
                $this->mLinks = $parserOutput->getLinks();
                $this->mImages = $parserOutput->getImages();
                $this->mTemplates = $parserOutput->getTemplates();

diff --cc includes/Revision.php
Simple merge

diff --cc includes/WikiPage.php
index a7a3170,b5f4c1d..c2278df
--- 1/includes/WikiPage.php
--- 2/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -3197,13 -2971,6 +3193,14 @@@ class WikiPage extends Page 
                global $wgUser;
                return $this->isParserCacheUsed( ParserOptions::newFromUser( $wgUser ), $oldid );
        }
 +
 +      public function getDeletionUpdates() {
 +              $updates = $this->getContentHandler()->getDeletionUpdates( $this );
 +
 +              wfRunHooks( 'WikiPageDeletionUpdates', array( $this, &$updates ) );
 +              return $updates;
 +      }
++
  }
  
  class PoolWorkArticleView extends PoolCounterWork {

diff --cc includes/actions/RawAction.php
Simple merge

diff --cc includes/api/ApiPurge.php
Simple merge

diff --cc includes/specials/SpecialUndelete.php
Simple merge

diff --cc languages/Language.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
Simple merge

diff --cc tests/phpunit/includes/filerepo/FileBackendTest.php
Simple merge

diff --cc tests/phpunit/maintenance/DumpTestCase.php
index eaa6aa0,976fd6b..71cd988
--- 1/tests/phpunit/maintenance/DumpTestCase.php
--- 2/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@@ -313,19 -311,9 +311,21 @@@ abstract class DumpTestCase extends Med
                $this->skipWhitespace();
  
                $this->assertTextNode( "comment", $summary );
 +              $this->skipWhitespace();
 +
 +              if ( $this->xml->name == "model" ) { // model tag is optional
 +                      $this->assertTextNode( "model", CONTENT_MODEL_WIKITEXT ); //@todo: make this a test parameter
 +                      $this->skipWhitespace();
 +              }
 +
 +
 +              if ( $this->xml->name == "format" ) { // format tag is optional
 +                      $this->assertTextNode( "format", CONTENT_FORMAT_WIKITEXT ); //@todo: make this a test parameter
 +                      $this->skipWhitespace();
 +              }
  
+               $this->assertTextNode( "sha1", $text_sha1 );
+ 
                $this->assertNodeStart( "text", false );
                if ( $text_bytes !== false ) {
                        $this->assertEquals( $this->xml->getAttribute( "bytes" ), $text_bytes,