* (bug 2234) allow special chars in database passwords during install

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a4a26eb..151908c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -219,6 +219,8 @@ Various bugfixes, small features, and a few experimental things:
 * Add validate table and val_ip column through the updater.
 * Simple rate limiter for edits and page moves; set $wgRateLimits
   (somewhat experimental; currently needs memcached)
+* (bug 2234) allow special chars in database passwords during install
+
 
 === Caveats ===
 

diff --git a/install-utils.inc b/install-utils.inc
index 1cd8560..913dae5 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -76,10 +76,12 @@ function replacevars( $ins ) {
        );
 
        foreach ( $varnames as $var ) {
-               global $$var;
-               $ins = str_replace( '{$' . $var . '}', $$var, $ins );
-               $ins = str_replace( '/*$' . $var . '*/`', '`' . $$var, $ins );
-               $ins = str_replace( '/*$' . $var . '*/', $$var, $ins );
+               if( isset( $GLOBALS[$var] ) ) {
+                       $val = addslashes( $GLOBALS[$var] );
+                       $ins = str_replace( '{$' . $var . '}', $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
+                       $ins = str_replace( '/*$' . $var . '*/', $val, $ins );
+               }
        }
        return $ins;
 }