| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -160,7 +160,7 @@ |
| 161 | 161 | 'icon' => '{$wgStylePath}/common/images/gnu-fdl.png', |
| 162 | 162 | ), |
| 163 | 163 | 'cc-choose' => array( |
| 164 | | - // details will be filled in by the selector |
| | 164 | + // Details will be filled in by the selector. |
| 165 | 165 | 'url' => '', |
| 166 | 166 | 'icon' => '', |
| 167 | 167 | 'text' => '', |
| Index: trunk/phase3/includes/installer/LocalSettingsGenerator.php |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class LocalSettingsGenerator { |
| | 5 | + |
| 5 | 6 | private $extensions = array(); |
| 6 | 7 | private $values = array(); |
| 7 | 8 | private $configPath = ''; |
| — | — | @@ -64,6 +65,13 @@ |
| 65 | 66 | $this->values['wgEmergencyContact'] = $this->values['wgPasswordSender']; |
| 66 | 67 | } |
| 67 | 68 | |
| | 69 | + /** |
| | 70 | + * Returns the escaped version of a string of php code. |
| | 71 | + * |
| | 72 | + * @param $string String |
| | 73 | + * |
| | 74 | + * @return String |
| | 75 | + */ |
| 68 | 76 | public static function escapePhpString( $string ) { |
| 69 | 77 | if ( is_array( $string ) || is_object( $string ) ) { |
| 70 | 78 | return false; |
| — | — | @@ -85,7 +93,8 @@ |
| 86 | 94 | /** |
| 87 | 95 | * Return the full text of the generated LocalSettings.php file, |
| 88 | 96 | * including the extensions |
| 89 | | - * @returns String |
| | 97 | + * |
| | 98 | + * @return String |
| 90 | 99 | */ |
| 91 | 100 | public function getText() { |
| 92 | 101 | $localSettings = $this->getDefaultText(); |
| — | — | @@ -101,6 +110,9 @@ |
| 102 | 111 | return $localSettings; |
| 103 | 112 | } |
| 104 | 113 | |
| | 114 | + /** |
| | 115 | + * @return String |
| | 116 | + */ |
| 105 | 117 | private function buildMemcachedServerList() { |
| 106 | 118 | $servers = $this->values['_MemCachedServers']; |
| 107 | 119 | |
| — | — | @@ -119,6 +131,9 @@ |
| 120 | 132 | } |
| 121 | 133 | } |
| 122 | 134 | |
| | 135 | + /** |
| | 136 | + * @return String |
| | 137 | + */ |
| 123 | 138 | private function getDefaultText() { |
| 124 | 139 | if( !$this->values['wgImageMagickConvertCommand'] ) { |
| 125 | 140 | $this->values['wgImageMagickConvertCommand'] = '/usr/bin/convert'; |