| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1068,6 +1068,9 @@ |
| 1069 | 1069 | return Html::rawElement( 'div', array( 'class' => 'config-download-link' ), $anchor ); |
| 1070 | 1070 | } |
| 1071 | 1071 | |
| | 1072 | + /** |
| | 1073 | + * @return bool |
| | 1074 | + */ |
| 1072 | 1075 | public function envCheckPath( ) { |
| 1073 | 1076 | // PHP_SELF isn't available sometimes, such as when PHP is CGI but |
| 1074 | 1077 | // cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME |
| — | — | @@ -1085,9 +1088,6 @@ |
| 1086 | 1089 | $this->showError( 'config-no-uri' ); |
| 1087 | 1090 | return false; |
| 1088 | 1091 | } |
| 1089 | | - |
| 1090 | | - |
| 1091 | 1092 | return parent::envCheckPath(); |
| 1092 | 1093 | } |
| 1093 | | - |
| 1094 | 1094 | } |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -296,11 +296,13 @@ |
| 297 | 297 | * The parameters are like parameters to wfMsg(). |
| 298 | 298 | * The messages will be in wikitext format, which will be converted to an |
| 299 | 299 | * output format such as HTML or text before being sent to the user. |
| | 300 | + * @param $msg |
| 300 | 301 | */ |
| 301 | 302 | public abstract function showMessage( $msg /*, ... */ ); |
| 302 | 303 | |
| 303 | 304 | /** |
| 304 | 305 | * Same as showMessage(), but for displaying errors |
| | 306 | + * @param $msg |
| 305 | 307 | */ |
| 306 | 308 | public abstract function showError( $msg /*, ... */ ); |
| 307 | 309 | |
| — | — | @@ -621,6 +623,7 @@ |
| 622 | 624 | |
| 623 | 625 | /** |
| 624 | 626 | * Environment check for DB types. |
| | 627 | + * @return bool |
| 625 | 628 | */ |
| 626 | 629 | protected function envCheckDB() { |
| 627 | 630 | global $wgLang; |
| — | — | @@ -865,6 +868,7 @@ |
| 866 | 869 | |
| 867 | 870 | /** |
| 868 | 871 | * Environment check for setting $IP and $wgScriptPath. |
| | 872 | + * @return bool |
| 869 | 873 | */ |
| 870 | 874 | protected function envCheckPath() { |
| 871 | 875 | global $IP; |
| — | — | @@ -890,6 +894,7 @@ |
| 891 | 895 | |
| 892 | 896 | /** |
| 893 | 897 | * TODO: document |
| | 898 | + * @return bool |
| 894 | 899 | */ |
| 895 | 900 | protected function envCheckShellLocale() { |
| 896 | 901 | $os = php_uname( 's' ); |
| — | — | @@ -1475,6 +1480,9 @@ |
| 1476 | 1481 | return $status; |
| 1477 | 1482 | } |
| 1478 | 1483 | |
| | 1484 | + /** |
| | 1485 | + * @param $s Status |
| | 1486 | + */ |
| 1479 | 1487 | private function subscribeToMediaWikiAnnounce( Status $s ) { |
| 1480 | 1488 | $params = array( |
| 1481 | 1489 | 'email' => $this->getVar( '_AdminEmail' ), |