| Index: trunk/phase3/CREDITS |
| — | — | @@ -148,6 +148,7 @@ |
| 149 | 149 | * Str4nd |
| 150 | 150 | * svip |
| 151 | 151 | * Tisane |
| | 152 | +* Tobias Müller |
| 152 | 153 | * Umherirrender |
| 153 | 154 | * Ville Stadista |
| 154 | 155 | * Vitaliy Filippov |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -860,12 +860,13 @@ |
| 861 | 861 | // PHP_SELF isn't available sometimes, such as when PHP is CGI but |
| 862 | 862 | // cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME |
| 863 | 863 | // to get the path to the current script... hopefully it's reliable. SIGH |
| 864 | | - if ( !empty( $_SERVER['PHP_SELF'] ) ) { |
| | 864 | + if ( $this->getVar( 'wgScriptPath' ) ) { |
| | 865 | + // Some kind soul has set it for us already (e.g. debconf) |
| | 866 | + return true; |
| | 867 | + } elseif ( !empty( $_SERVER['PHP_SELF'] ) ) { |
| 865 | 868 | $path = $_SERVER['PHP_SELF']; |
| 866 | 869 | } elseif ( !empty( $_SERVER['SCRIPT_NAME'] ) ) { |
| 867 | 870 | $path = $_SERVER['SCRIPT_NAME']; |
| 868 | | - } elseif ( $this->getVar( 'wgScriptPath' ) ) { |
| 869 | | - // Some kind soul has set it for us already (e.g. debconf) |
| 870 | 871 | return true; |
| 871 | 872 | } else { |
| 872 | 873 | $this->showError( 'config-no-uri' ); |
| — | — | @@ -1249,7 +1250,7 @@ |
| 1250 | 1251 | require( "$IP/includes/DefaultSettings.php" ); |
| 1251 | 1252 | |
| 1252 | 1253 | foreach( $exts as $e ) { |
| 1253 | | - require_once( "$IP/extensions/$e/$e.php" ); |
| | 1254 | + require_once( "$IP/extensions/$e/$e.php" ); |
| 1254 | 1255 | } |
| 1255 | 1256 | |
| 1256 | 1257 | $hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ? |