Update to MediaWiki 1.22.0

1 files changed, 9 insertions, 3 deletions

diff --git a/includes/installer/InstallDocFormatter.php b/includes/installer/InstallDocFormatter.php
index a508e24c..6d3819cd 100644
--- a/includes/installer/InstallDocFormatter.php
+++ b/includes/installer/InstallDocFormatter.php
@@ -23,6 +23,7 @@
 class InstallDocFormatter {
 	static function format( $text ) {
 		$obj = new self( $text );
+
 		return $obj->execute();
 	}
 
@@ -33,8 +34,8 @@ class InstallDocFormatter {
 	protected function execute() {
 		$text = $this->text;
 		// Use Unix line endings, escape some wikitext stuff
-		$text = str_replace( array( '<', '{{', '[[', "\r" ),
-			array( '&lt;', '&#123;&#123;', '&#91;&#91;', '' ), $text );
+		$text = str_replace( array( '<', '{{', '[[', '__', "\r" ),
+			array( '&lt;', '&#123;&#123;', '&#91;&#91;', '&#95;&#95;', '' ), $text );
 		// join word-wrapped lines into one
 		do {
 			$prev = $text;
@@ -46,7 +47,12 @@ class InstallDocFormatter {
 		// turn (bug nnnn) into links
 		$text = preg_replace_callback( '/bug (\d+)/', array( $this, 'replaceBugLinks' ), $text );
 		// add links to manual to every global variable mentioned
-		$text = preg_replace_callback( '/(\$wg[a-z0-9_]+)/i', array( $this, 'replaceConfigLinks' ), $text );
+		$text = preg_replace_callback(
+			'/(\$wg[a-z0-9_]+)/i',
+			array( $this, 'replaceConfigLinks' ),
+			$text
+		);
+
 		return $text;
 	}