diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
commit | 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch) | |
tree | af68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /includes/installer/InstallDocFormatter.php | |
parent | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff) |
Update to MediaWiki 1.22.0
Diffstat (limited to 'includes/installer/InstallDocFormatter.php')
-rw-r--r-- | includes/installer/InstallDocFormatter.php | 12 |
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( '<', '{{', '[[', '' ), $text ); + $text = str_replace( array( '<', '{{', '[[', '__', "\r" ), + array( '<', '{{', '[[', '__', '' ), $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; } |