| Index: trunk/phase3/includes/installer/LocalSettingsGenerator.php |
| — | — | @@ -191,10 +191,10 @@ |
| 192 | 192 | \$wgEnableUserEmail = {$this->values['wgEnableUserEmail']}; # UPO |
| 193 | 193 | |
| 194 | 194 | \$wgEmergencyContact = \"{$this->values['wgEmergencyContact']}\"; |
| 195 | | -\$wgPasswordSender = \"{$this->values['wgPasswordSender']}\"; |
| | 195 | +\$wgPasswordSender = \"{$this->values['wgPasswordSender']}\"; |
| 196 | 196 | |
| 197 | | -\$wgEnotifUserTalk = {$this->values['wgEnotifUserTalk']}; # UPO |
| 198 | | -\$wgEnotifWatchlist = {$this->values['wgEnotifWatchlist']}; # UPO |
| | 197 | +\$wgEnotifUserTalk = {$this->values['wgEnotifUserTalk']}; # UPO |
| | 198 | +\$wgEnotifWatchlist = {$this->values['wgEnotifWatchlist']}; # UPO |
| 199 | 199 | \$wgEmailAuthentication = {$this->values['wgEmailAuthentication']}; |
| 200 | 200 | |
| 201 | 201 | ## Database settings |
| — | — | @@ -207,12 +207,12 @@ |
| 208 | 208 | {$this->dbSettings} |
| 209 | 209 | |
| 210 | 210 | ## Shared memory settings |
| 211 | | -\$wgMainCacheType = $cacheType; |
| | 211 | +\$wgMainCacheType = $cacheType; |
| 212 | 212 | \$wgMemCachedServers = $mcservers; |
| 213 | 213 | |
| 214 | 214 | ## To enable image uploads, make sure the 'images' directory |
| 215 | 215 | ## is writable, then set this to true: |
| 216 | | -\$wgEnableUploads = {$this->values['wgEnableUploads']}; |
| | 216 | +\$wgEnableUploads = {$this->values['wgEnableUploads']}; |
| 217 | 217 | {$magic}\$wgUseImageMagick = true; |
| 218 | 218 | {$magic}\$wgImageMagickConvertCommand = \"{$this->values['wgImageMagickConvertCommand']}\"; |
| 219 | 219 | |
| — | — | @@ -251,7 +251,7 @@ |
| 252 | 252 | ## License and Creative Commons licenses are supported so far. |
| 253 | 253 | {$rights}\$wgEnableCreativeCommonsRdf = true; |
| 254 | 254 | \$wgRightsPage = \"\"; # Set to the title of a wiki page that describes your license/copyright |
| 255 | | -\$wgRightsUrl = \"{$this->values['wgRightsUrl']}\"; |
| | 255 | +\$wgRightsUrl = \"{$this->values['wgRightsUrl']}\"; |
| 256 | 256 | \$wgRightsText = \"{$this->values['wgRightsText']}\"; |
| 257 | 257 | \$wgRightsIcon = \"{$this->values['wgRightsIcon']}\"; |
| 258 | 258 | # \$wgRightsCode = \"{$this->values['wgRightsCode']}\"; # Not yet used |