merged master

Change-Id: I6cf08c09c7d9b38ecce0b2bbed61431939edd7d4

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/Article.php
Simple merge

diff --cc includes/AutoLoader.php
index 0fee7c1,cedb3d2..c3a90f5
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -279,20 -283,8 +283,21 @@@ $wgAutoloadLocalClasses = array
        'XmlTypeCheck' => 'includes/XmlTypeCheck.php',
        'ZhClient' => 'includes/ZhClient.php',
        'ZipDirectoryReader' => 'includes/ZipDirectoryReader.php',
+       'ZipDirectoryReaderError' => 'includes/ZipDirectoryReader.php',
  
 +      # content handler
 +      'Content' => 'includes/Content.php',
 +      'AbstractContent' => 'includes/Content.php',
 +      'ContentHandler' => 'includes/ContentHandler.php',
 +      'CssContent' => 'includes/Content.php',
 +      'CssContentHandler' => 'includes/ContentHandler.php',
 +      'JavaScriptContent' => 'includes/Content.php',
 +      'JavaScriptContentHandler' => 'includes/ContentHandler.php',
 +      'MessageContent' => 'includes/Content.php',
 +      'TextContent' => 'includes/Content.php',
 +      'WikitextContent' => 'includes/Content.php',
 +      'WikitextContentHandler' => 'includes/ContentHandler.php',
 +
        # includes/actions
        'CachedAction' => 'includes/actions/CachedAction.php',
        'CreditsAction' => 'includes/actions/CreditsAction.php',

diff --cc includes/EditPage.php
Simple merge

diff --cc includes/Export.php
Simple merge

diff --cc includes/Revision.php
Simple merge

diff --cc includes/Title.php
Simple merge

diff --cc includes/WikiPage.php
Simple merge

diff --cc includes/parser/Parser.php
Simple merge

diff --cc languages/Language.php
Simple merge

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

diff --cc maintenance/checkBadRedirects.php
Simple merge

diff --cc tests/phpunit/maintenance/DumpTestCase.php
index 89ae688,e71e76c..3dbd9ed
--- 1/tests/phpunit/maintenance/DumpTestCase.php
--- 2/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@@ -295,11 -295,9 +295,13 @@@ abstract class DumpTestCase extends Med
         * @param $text_sha1 string: the base36 SHA-1 of the revision's text
         * @param $text string|false: (optional) The revision's string, or false to check for a
         *            revision stub
 +       * @param $model int: the expected content model id (default: CONTENT_MODEL_WIKITEXT)
 +       * @param $format int: the expected format model id (default: CONTENT_FORMAT_WIKITEXT)
+        * @param $parentid int|false: (optional) id of the parent revision
         */
-       protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false,
-                                                                               $model = CONTENT_MODEL_WIKITEXT, $format = CONTENT_FORMAT_WIKITEXT ) {
 -      protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false, $parentid = false ) {
++      protected function assertRevision( $id, $summary, $text_id, $text_bytes, $text_sha1, $text = false, 
++                                              $model = CONTENT_MODEL_WIKITEXT, $format = CONTENT_FORMAT_WIKITEXT,
++                                              $parentid = false ) {
  
                $this->assertNodeStart( "revision" );
                $this->skipWhitespace();
@@@ -367,5 -344,9 +372,8 @@@
                        $this->assertNodeEnd( "text" );
                        $this->skipWhitespace();
                }
+ 
+               $this->assertNodeEnd( "revision" );
+               $this->skipWhitespace();
        }
- }
 -
+ }

diff --cc tests/phpunit/maintenance/backupPrefetchTest.php
index 33168c0,6ec802c..77b1b74
--- 1/tests/phpunit/maintenance/backupPrefetchTest.php
--- 2/tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/tests/phpunit/maintenance/backupPrefetchTest.php
@@@ -195,10 -197,8 +197,10 @@@ class BaseDumpTest extends MediaWikiTes
          <ip>127.0.0.1</ip>
        </contributor>
        <comment>BackupDumperTestP1Summary1</comment>
-       <text xml:space="preserve">BackupDumperTestP1Text1</text>
        <sha1>0bolhl6ol7i6x0e7yq91gxgaan39j87</sha1>
+       <text xml:space="preserve">BackupDumperTestP1Text1</text>
 +      <model name="wikitext">1</model>
 +      <format mime="text/x-wiki">1</format>
      </revision>
    </page>
  ';
@@@ -214,10 -215,8 +217,10 @@@
          <ip>127.0.0.1</ip>
        </contributor>
        <comment>BackupDumperTestP2Summary1</comment>
-       <text xml:space="preserve">BackupDumperTestP2Text1</text>
        <sha1>jprywrymfhysqllua29tj3sc7z39dl2</sha1>
+       <text xml:space="preserve">BackupDumperTestP2Text1</text>
 +      <model name="wikitext">1</model>
 +      <format mime="text/x-wiki">1</format>
      </revision>
      <revision>
        <id>5</id>
@@@ -226,10 -225,8 +229,10 @@@
          <ip>127.0.0.1</ip>
        </contributor>
        <comment>BackupDumperTestP2Summary4 extra</comment>
-       <text xml:space="preserve">BackupDumperTestP2Text4 some additional Text</text>
        <sha1>6o1ciaxa6pybnqprmungwofc4lv00wv</sha1>
+       <text xml:space="preserve">BackupDumperTestP2Text4 some additional Text</text>
 +      <model name="wikitext">1</model>
 +      <format mime="text/x-wiki">1</format>
      </revision>
    </page>
  ';
@@@ -245,10 -242,8 +248,10 @@@
          <ip>127.0.0.1</ip>
        </contributor>
        <comment>Talk BackupDumperTestP1 Summary1</comment>
-       <text xml:space="preserve">Talk about BackupDumperTestP1 Text1</text>
        <sha1>nktofwzd0tl192k3zfepmlzxoax1lpe</sha1>
 +      <model name="wikitext">1</model>
 +      <format mime="text/x-wiki">1</format>
+       <text xml:space="preserve">Talk about BackupDumperTestP1 Text1</text>
      </revision>
    </page>
  ';

diff --cc tests/phpunit/maintenance/backupTextPassTest.php
Simple merge