Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 220 insertions, 82 deletions

diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php
index 8a7facec..e17c7b0f 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -3,6 +3,7 @@
 /**
  * Test class for Revision storage.
  *
+ * @group ContentHandler
  * @group Database
  * ^--- important, causes temporary tables to be used instead of the real database
  *
@@ -11,41 +12,81 @@
  */
 class RevisionStorageTest extends MediaWikiTestCase {
 
+	/**
+	 * @var WikiPage $the_page
+	 */
 	var $the_page;
 
-	function  __construct( $name = null, array $data = array(), $dataName = '' ) {
+	function __construct( $name = null, array $data = array(), $dataName = '' ) {
 		parent::__construct( $name, $data, $dataName );
 
 		$this->tablesUsed = array_merge( $this->tablesUsed,
-		                                 array( 'page',
-		                                      'revision',
-		                                      'text',
-
-		                                      'recentchanges',
-		                                      'logging',
-
-		                                      'page_props',
-		                                      'pagelinks',
-		                                      'categorylinks',
-		                                      'langlinks',
-		                                      'externallinks',
-		                                      'imagelinks',
-		                                      'templatelinks',
-		                                      'iwlinks' ) );
+			array( 'page',
+				'revision',
+				'text',
+
+				'recentchanges',
+				'logging',
+
+				'page_props',
+				'pagelinks',
+				'categorylinks',
+				'langlinks',
+				'externallinks',
+				'imagelinks',
+				'templatelinks',
+				'iwlinks' ) );
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
+
+		parent::setUp();
+
+		$wgExtraNamespaces[12312] = 'Dummy';
+		$wgExtraNamespaces[12313] = 'Dummy_talk';
+
+		$wgNamespaceContentModels[12312] = 'DUMMY';
+		$wgContentHandlers['DUMMY'] = 'DummyContentHandlerForTesting';
+
+		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+		$wgContLang->resetNamespaces(); # reset namespace cache
 		if ( !$this->the_page ) {
-			$this->the_page = $this->createPage( 'RevisionStorageTest_the_page', "just a dummy page" );
+			$this->the_page = $this->createPage( 'RevisionStorageTest_the_page', "just a dummy page", CONTENT_MODEL_WIKITEXT );
 		}
 	}
 
+	public function tearDown() {
+		global $wgExtraNamespaces, $wgNamespaceContentModels, $wgContentHandlers, $wgContLang;
+
+		parent::tearDown();
+
+		unset( $wgExtraNamespaces[12312] );
+		unset( $wgExtraNamespaces[12313] );
+
+		unset( $wgNamespaceContentModels[12312] );
+		unset( $wgContentHandlers['DUMMY'] );
+
+		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+		$wgContLang->resetNamespaces(); # reset namespace cache
+	}
+
 	protected function makeRevision( $props = null ) {
-		if ( $props === null ) $props = array();
+		if ( $props === null ) {
+			$props = array();
+		}
+
+		if ( !isset( $props['content'] ) && !isset( $props['text'] ) ) {
+			$props['text'] = 'Lorem Ipsum';
+		}
 
-		if ( !isset( $props['content'] ) && !isset( $props['text'] ) ) $props['text'] = 'Lorem Ipsum';
-		if ( !isset( $props['comment'] ) ) $props['comment'] = 'just a test';
-		if ( !isset( $props['page'] ) ) $props['page'] = $this->the_page->getId();
+		if ( !isset( $props['comment'] ) ) {
+			$props['comment'] = 'just a test';
+		}
+
+		if ( !isset( $props['page'] ) ) {
+			$props['page'] = $this->the_page->getId();
+		}
 
 		$rev = new Revision( $props );
 
@@ -56,14 +97,27 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	}
 
 	protected function createPage( $page, $text, $model = null ) {
-		if ( is_string( $page ) ) $page = Title::newFromText( $page );
-		if ( $page instanceof Title ) $page = new WikiPage( $page );
+		if ( is_string( $page ) ) {
+			if ( !preg_match( '/:/', $page ) &&
+				( $model === null || $model === CONTENT_MODEL_WIKITEXT )
+			) {
+				$ns = $this->getDefaultWikitextNS();
+				$page = MWNamespace::getCanonicalName( $ns ) . ':' . $page;
+			}
+
+			$page = Title::newFromText( $page );
+		}
+
+		if ( $page instanceof Title ) {
+			$page = new WikiPage( $page );
+		}
 
 		if ( $page->exists() ) {
 			$page->doDeleteArticle( "done" );
 		}
 
-		$page->doEdit( $text, "testing", EDIT_NEW );
+		$content = ContentHandler::makeContent( $text, $page->getTitle(), $model );
+		$page->doEditContent( $content, "testing", EDIT_NEW );
 
 		return $page;
 	}
@@ -75,14 +129,15 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		$this->assertEquals( $orig->getPage(), $rev->getPage() );
 		$this->assertEquals( $orig->getTimestamp(), $rev->getTimestamp() );
 		$this->assertEquals( $orig->getUser(), $rev->getUser() );
+		$this->assertEquals( $orig->getContentModel(), $rev->getContentModel() );
+		$this->assertEquals( $orig->getContentFormat(), $rev->getContentFormat() );
 		$this->assertEquals( $orig->getSha1(), $rev->getSha1() );
 	}
 
 	/**
 	 * @covers Revision::__construct
 	 */
-	public function testConstructFromRow()
-	{
+	public function testConstructFromRow() {
 		$orig = $this->makeRevision();
 
 		$dbr = wfgetDB( DB_SLAVE );
@@ -100,8 +155,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::newFromRow
 	 */
-	public function testNewFromRow()
-	{
+	public function testNewFromRow() {
 		$orig = $this->makeRevision();
 
 		$dbr = wfgetDB( DB_SLAVE );
@@ -120,9 +174,8 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::newFromArchiveRow
 	 */
-	public function testNewFromArchiveRow()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testNewFromArchiveRow', 'Lorem Ipsum' );
+	public function testNewFromArchiveRow() {
+		$page = $this->createPage( 'RevisionStorageTest_testNewFromArchiveRow', 'Lorem Ipsum', CONTENT_MODEL_WIKITEXT );
 		$orig = $page->getRevision();
 		$page->doDeleteArticle( 'test Revision::newFromArchiveRow' );
 
@@ -141,8 +194,7 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::newFromId
 	 */
-	public function testNewFromId()
-	{
+	public function testNewFromId() {
 		$orig = $this->makeRevision();
 
 		$rev = Revision::newFromId( $orig->getId() );
@@ -153,12 +205,11 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::fetchRevision
 	 */
-	public function testFetchRevision()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testFetchRevision', 'one' );
+	public function testFetchRevision() {
+		$page = $this->createPage( 'RevisionStorageTest_testFetchRevision', 'one', CONTENT_MODEL_WIKITEXT );
 		$id1 = $page->getRevision()->getId();
 
-		$page->doEdit( 'two', 'second rev' );
+		$page->doEditContent( new WikitextContent( 'two' ), 'second rev' );
 		$id2 = $page->getRevision()->getId();
 
 		$res = Revision::fetchRevision( $page->getTitle() );
@@ -166,32 +217,39 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		#note: order is unspecified
 		$rows = array();
 		while ( ( $row = $res->fetchObject() ) ) {
-			$rows[ $row->rev_id ]= $row;
+			$rows[$row->rev_id] = $row;
 		}
 
 		$row = $res->fetchObject();
-		$this->assertEquals( 1, count($rows), 'expected exactly one revision' );
+		$this->assertEquals( 1, count( $rows ), 'expected exactly one revision' );
 		$this->assertArrayHasKey( $id2, $rows, 'missing revision with id ' . $id2 );
 	}
 
 	/**
 	 * @covers Revision::selectFields
 	 */
-	public function testSelectFields()
-	{
+	public function testSelectFields() {
+		global $wgContentHandlerUseDB;
+
 		$fields = Revision::selectFields();
 
-		$this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields');
-		$this->assertTrue( in_array( 'rev_page', $fields ), 'missing rev_page in list of fields');
-		$this->assertTrue( in_array( 'rev_timestamp', $fields ), 'missing rev_timestamp in list of fields');
-		$this->assertTrue( in_array( 'rev_user', $fields ), 'missing rev_user in list of fields');
+		$this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields' );
+		$this->assertTrue( in_array( 'rev_page', $fields ), 'missing rev_page in list of fields' );
+		$this->assertTrue( in_array( 'rev_timestamp', $fields ), 'missing rev_timestamp in list of fields' );
+		$this->assertTrue( in_array( 'rev_user', $fields ), 'missing rev_user in list of fields' );
+
+		if ( $wgContentHandlerUseDB ) {
+			$this->assertTrue( in_array( 'rev_content_model', $fields ),
+				'missing rev_content_model in list of fields' );
+			$this->assertTrue( in_array( 'rev_content_format', $fields ),
+				'missing rev_content_format in list of fields' );
+		}
 	}
 
 	/**
 	 * @covers Revision::getPage
 	 */
-	public function testGetPage()
-	{
+	public function testGetPage() {
 		$page = $this->the_page;
 
 		$orig = $this->makeRevision( array( 'page' => $page->getId() ) );
@@ -203,8 +261,9 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::getText
 	 */
-	public function testGetText()
-	{
+	public function testGetText() {
+		$this->hideDeprecated( 'Revision::getText' );
+
 		$orig = $this->makeRevision( array( 'text' => 'hello hello.' ) );
 		$rev = Revision::newFromId( $orig->getId() );
 
@@ -212,10 +271,37 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	}
 
 	/**
+	 * @covers Revision::getContent
+	 */
+	public function testGetContent_failure() {
+		$rev = new Revision( array(
+			'page' => $this->the_page->getId(),
+			'content_model' => $this->the_page->getContentModel(),
+			'text_id' => 123456789, // not in the test DB
+		) );
+
+		$this->assertNull( $rev->getContent(),
+			"getContent() should return null if the revision's text blob could not be loaded." );
+
+		//NOTE: check this twice, once for lazy initialization, and once with the cached value.
+		$this->assertNull( $rev->getContent(),
+			"getContent() should return null if the revision's text blob could not be loaded." );
+	}
+
+	/**
+	 * @covers Revision::getContent
+	 */
+	public function testGetContent() {
+		$orig = $this->makeRevision( array( 'text' => 'hello hello.' ) );
+		$rev = Revision::newFromId( $orig->getId() );
+
+		$this->assertEquals( 'hello hello.', $rev->getContent()->getNativeData() );
+	}
+
+	/**
 	 * @covers Revision::revText
 	 */
-	public function testRevText()
-	{
+	public function testRevText() {
 		$this->hideDeprecated( 'Revision::revText' );
 		$orig = $this->makeRevision( array( 'text' => 'hello hello rev.' ) );
 		$rev = Revision::newFromId( $orig->getId() );
@@ -226,31 +312,69 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::getRawText
 	 */
-	public function testGetRawText()
-	{
+	public function testGetRawText() {
+		$this->hideDeprecated( 'Revision::getRawText' );
+
 		$orig = $this->makeRevision( array( 'text' => 'hello hello raw.' ) );
 		$rev = Revision::newFromId( $orig->getId() );
 
 		$this->assertEquals( 'hello hello raw.', $rev->getRawText() );
 	}
+
+	/**
+	 * @covers Revision::getContentModel
+	 */
+	public function testGetContentModel() {
+		global $wgContentHandlerUseDB;
+
+		if ( !$wgContentHandlerUseDB ) {
+			$this->markTestSkipped( '$wgContentHandlerUseDB is disabled' );
+		}
+
+		$orig = $this->makeRevision( array( 'text' => 'hello hello.',
+			'content_model' => CONTENT_MODEL_JAVASCRIPT ) );
+		$rev = Revision::newFromId( $orig->getId() );
+
+		$this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
+	}
+
+	/**
+	 * @covers Revision::getContentFormat
+	 */
+	public function testGetContentFormat() {
+		global $wgContentHandlerUseDB;
+
+		if ( !$wgContentHandlerUseDB ) {
+			$this->markTestSkipped( '$wgContentHandlerUseDB is disabled' );
+		}
+
+		$orig = $this->makeRevision( array(
+			'text' => 'hello hello.',
+			'content_model' => CONTENT_MODEL_JAVASCRIPT,
+			'content_format' => CONTENT_FORMAT_JAVASCRIPT
+		) );
+		$rev = Revision::newFromId( $orig->getId() );
+
+		$this->assertEquals( CONTENT_FORMAT_JAVASCRIPT, $rev->getContentFormat() );
+	}
+
 	/**
 	 * @covers Revision::isCurrent
 	 */
-	public function testIsCurrent()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testIsCurrent', 'Lorem Ipsum' );
+	public function testIsCurrent() {
+		$page = $this->createPage( 'RevisionStorageTest_testIsCurrent', 'Lorem Ipsum', CONTENT_MODEL_WIKITEXT );
 		$rev1 = $page->getRevision();
 
-		# @todo: find out if this should be true
+		# @todo find out if this should be true
 		# $this->assertTrue( $rev1->isCurrent() );
 
 		$rev1x = Revision::newFromId( $rev1->getId() );
 		$this->assertTrue( $rev1x->isCurrent() );
 
-		$page->doEdit( 'Bla bla', 'second rev' );
+		$page->doEditContent( ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ), 'second rev' );
 		$rev2 = $page->getRevision();
 
-		# @todo: find out if this should be true
+		# @todo find out if this should be true
 		# $this->assertTrue( $rev2->isCurrent() );
 
 		$rev1x = Revision::newFromId( $rev1->getId() );
@@ -263,14 +387,14 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::getPrevious
 	 */
-	public function testGetPrevious()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testGetPrevious', 'Lorem Ipsum testGetPrevious' );
+	public function testGetPrevious() {
+		$page = $this->createPage( 'RevisionStorageTest_testGetPrevious', 'Lorem Ipsum testGetPrevious', CONTENT_MODEL_WIKITEXT );
 		$rev1 = $page->getRevision();
 
 		$this->assertNull( $rev1->getPrevious() );
 
-		$page->doEdit( 'Bla bla', 'second rev testGetPrevious' );
+		$page->doEditContent( ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
+			'second rev testGetPrevious' );
 		$rev2 = $page->getRevision();
 
 		$this->assertNotNull( $rev2->getPrevious() );
@@ -280,14 +404,14 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::getNext
 	 */
-	public function testGetNext()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testGetNext', 'Lorem Ipsum testGetNext' );
+	public function testGetNext() {
+		$page = $this->createPage( 'RevisionStorageTest_testGetNext', 'Lorem Ipsum testGetNext', CONTENT_MODEL_WIKITEXT );
 		$rev1 = $page->getRevision();
 
 		$this->assertNull( $rev1->getNext() );
 
-		$page->doEdit( 'Bla bla', 'second rev testGetNext' );
+		$page->doEditContent( ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
+			'second rev testGetNext' );
 		$rev2 = $page->getRevision();
 
 		$this->assertNotNull( $rev1->getNext() );
@@ -297,20 +421,21 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	/**
 	 * @covers Revision::newNullRevision
 	 */
-	public function testNewNullRevision()
-	{
-		$page = $this->createPage( 'RevisionStorageTest_testNewNullRevision', 'some testing text' );
+	public function testNewNullRevision() {
+		$page = $this->createPage( 'RevisionStorageTest_testNewNullRevision', 'some testing text', CONTENT_MODEL_WIKITEXT );
 		$orig = $page->getRevision();
 
 		$dbw = wfGetDB( DB_MASTER );
 		$rev = Revision::newNullRevision( $dbw, $page->getId(), 'a null revision', false );
 
-		$this->assertNotEquals( $orig->getId(), $rev->getId(), 'new null revision shold have a different id from the original revision' );
-		$this->assertEquals( $orig->getTextId(), $rev->getTextId(), 'new null revision shold have the same text id as the original revision' );
-		$this->assertEquals( 'some testing text', $rev->getText() );
+		$this->assertNotEquals( $orig->getId(), $rev->getId(),
+			'new null revision shold have a different id from the original revision' );
+		$this->assertEquals( $orig->getTextId(), $rev->getTextId(),
+			'new null revision shold have the same text id as the original revision' );
+		$this->assertEquals( 'some testing text', $rev->getContent()->getNativeData() );
 	}
 
-	public function dataUserWasLastToEdit() {
+	public static function provideUserWasLastToEdit() {
 		return array(
 			array( #0
 				3, true, # actually the last edit
@@ -328,32 +453,37 @@ class RevisionStorageTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * @dataProvider dataUserWasLastToEdit
+	 * @dataProvider provideUserWasLastToEdit
 	 */
 	public function testUserWasLastToEdit( $sinceIdx, $expectedLast ) {
-		$userA = \User::newFromName( "RevisionStorageTest_userA" );
-		$userB = \User::newFromName( "RevisionStorageTest_userB" );
+		$userA = User::newFromName( "RevisionStorageTest_userA" );
+		$userB = User::newFromName( "RevisionStorageTest_userB" );
 
 		if ( $userA->getId() === 0 ) {
-			$userA = \User::createNew( $userA->getName() );
+			$userA = User::createNew( $userA->getName() );
 		}
 
 		if ( $userB->getId() === 0 ) {
-			$userB = \User::createNew( $userB->getName() );
+			$userB = User::createNew( $userB->getName() );
 		}
 
+		$ns = $this->getDefaultWikitextNS();
+
 		$dbw = wfGetDB( DB_MASTER );
 		$revisions = array();
 
 		// create revisions -----------------------------
-		$page = WikiPage::factory( Title::newFromText( 'RevisionStorageTest_testUserWasLastToEdit' ) );
+		$page = WikiPage::factory( Title::newFromText(
+			'RevisionStorageTest_testUserWasLastToEdit', $ns ) );
 
 		# zero
 		$revisions[0] = new Revision( array(
 			'page' => $page->getId(),
+			'title' => $page->getTitle(), // we need the title to determine the page's default content model
 			'timestamp' => '20120101000000',
 			'user' => $userA->getId(),
 			'text' => 'zero',
+			'content_model' => CONTENT_MODEL_WIKITEXT,
 			'summary' => 'edit zero'
 		) );
 		$revisions[0]->insertOn( $dbw );
@@ -361,9 +491,11 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		# one
 		$revisions[1] = new Revision( array(
 			'page' => $page->getId(),
+			'title' => $page->getTitle(), // still need the title, because $page->getId() is 0 (there's no entry in the page table)
 			'timestamp' => '20120101000100',
 			'user' => $userA->getId(),
 			'text' => 'one',
+			'content_model' => CONTENT_MODEL_WIKITEXT,
 			'summary' => 'edit one'
 		) );
 		$revisions[1]->insertOn( $dbw );
@@ -371,9 +503,11 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		# two
 		$revisions[2] = new Revision( array(
 			'page' => $page->getId(),
+			'title' => $page->getTitle(),
 			'timestamp' => '20120101000200',
 			'user' => $userB->getId(),
 			'text' => 'two',
+			'content_model' => CONTENT_MODEL_WIKITEXT,
 			'summary' => 'edit two'
 		) );
 		$revisions[2]->insertOn( $dbw );
@@ -381,9 +515,11 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		# three
 		$revisions[3] = new Revision( array(
 			'page' => $page->getId(),
+			'title' => $page->getTitle(),
 			'timestamp' => '20120101000300',
 			'user' => $userA->getId(),
 			'text' => 'three',
+			'content_model' => CONTENT_MODEL_WIKITEXT,
 			'summary' => 'edit three'
 		) );
 		$revisions[3]->insertOn( $dbw );
@@ -391,15 +527,17 @@ class RevisionStorageTest extends MediaWikiTestCase {
 		# four
 		$revisions[4] = new Revision( array(
 			'page' => $page->getId(),
+			'title' => $page->getTitle(),
 			'timestamp' => '20120101000200',
 			'user' => $userA->getId(),
 			'text' => 'zero',
+			'content_model' => CONTENT_MODEL_WIKITEXT,
 			'summary' => 'edit four'
 		) );
 		$revisions[4]->insertOn( $dbw );
 
 		// test it ---------------------------------
-		$since = $revisions[ $sinceIdx ]->getTimestamp();
+		$since = $revisions[$sinceIdx]->getTimestamp();
 
 		$wasLast = Revision::userWasLastToEdit( $dbw, $page->getId(), $userA->getId(), $since );