From: daniel <daniel.kinzler@wikimedia.de>
Date: Wed, 20 Jun 2012 17:13:16 +0000 (+0200)
Subject: merged master
X-Git-Tag: 1.31.0-rc.0~22097^2^2~90
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=b801fa8b3b3b42fb6db9129d4642f6e583b56879;p=lhc%2Fweb%2Fwiklou.git

merged master

Change-Id: I6cf08c09c7d9b38ecce0b2bbed61431939edd7d4
---

b801fa8b3b3b42fb6db9129d4642f6e583b56879
diff --cc includes/AutoLoader.php
index 0fee7c11d7,cedb3d20ea..c3a90f53bc
--- a/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 tests/phpunit/maintenance/DumpTestCase.php
index 89ae68841f,e71e76c7d5..3dbd9edcc1
--- a/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 33168c01a9,6ec802c772..77b1b74f7a
--- a/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>
  ';