| Index: branches/new-installer/phase3/includes/installer/LocalSettings.php |
| — | — | @@ -34,10 +34,10 @@ |
| 35 | 35 | $this->dbSettings = $db->getLocalSettings(); |
| 36 | 36 | $this->safeMode = $installer->getVar( '_SafeMode' ); |
| 37 | 37 | $this->values['wgEmergencyContact'] = $this->values['wgPasswordSender']; |
| 38 | | - $this->values = wfArrayMap( array( $this, 'escapePhpString' ), $this->values ); |
| | 38 | + $this->values = wfArrayMap( array( 'LocalSettings', 'escapePhpString' ), $this->values ); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | | - function escapePhpString( $string ) { |
| | 41 | + public static function escapePhpString( $string ) { |
| 42 | 42 | if ( is_array( $string ) || is_object( $string ) ) { |
| 43 | 43 | return false; |
| 44 | 44 | } |
| — | — | @@ -111,9 +111,9 @@ |
| 112 | 112 | } |
| 113 | 113 | $mcservers = $this->buildMemcachedServerList(); |
| 114 | 114 | return "<?php |
| 115 | | -# This file was automatically generated by the MediaWiki installer. |
| 116 | | -# If you make manual changes, please keep track in case you need to |
| 117 | | -# recreate them later. |
| | 115 | +# This file was automatically generated by the MediaWiki {$GLOBALS['wgVersion']} |
| | 116 | +# installer. If you make manual changes, please keep track in case you |
| | 117 | +# need to recreate them later. |
| 118 | 118 | # |
| 119 | 119 | # See includes/DefaultSettings.php for all configurable settings |
| 120 | 120 | # and their default values, but don't forget to make changes in _this_ |
| Index: branches/new-installer/phase3/includes/installer/SqliteInstaller.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | function getLocalSettings() { |
| 129 | | - $dir = $this->getVar( 'wgSQLiteDataDir' ); |
| | 129 | + $dir = LocalSettings::escapePhpString( $this->getVar( 'wgSQLiteDataDir' ) ); |
| 130 | 130 | return |
| 131 | 131 | "# SQLite-specific settings |
| 132 | 132 | \$wgSQLiteDataDir = \"{$dir}\";"; |