Merge "Language: s/error_log/wfWarn/"

[lhc/web/wiklou.git] / includes / installer / InstallDocFormatter.php

diff --git a/includes/installer/InstallDocFormatter.php b/includes/installer/InstallDocFormatter.php
index ce282cc..3250ff8 100644 (file)
--- 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();
        }
 
@@ -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;
        }
 
@@ -56,7 +62,7 @@ class InstallDocFormatter {
        }
 
        protected function replaceConfigLinks( $matches ) {
-               return '<span class="config-plainlink">[http://www.mediawiki.org/wiki/Manual:' .
+               return '<span class="config-plainlink">[https://www.mediawiki.org/wiki/Manual:' .
                        $matches[1] . ' ' . $matches[1] . ']</span>';
        }
 }