| Index: trunk/phase3/CREDITS |
| — | — | @@ -150,7 +150,6 @@ |
| 151 | 151 | * svip |
| 152 | 152 | * The Evil IP address |
| 153 | 153 | * Tisane |
| 154 | | -* Tobias Müller |
| 155 | 154 | * Umherirrender |
| 156 | 155 | * Ville Stadista |
| 157 | 156 | * Vitaliy Filippov |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -860,13 +860,12 @@ |
| 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 ( $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'] ) ) { |
| | 864 | + if ( !empty( $_SERVER['PHP_SELF'] ) ) { |
| 868 | 865 | $path = $_SERVER['PHP_SELF']; |
| 869 | 866 | } elseif ( !empty( $_SERVER['SCRIPT_NAME'] ) ) { |
| 870 | 867 | $path = $_SERVER['SCRIPT_NAME']; |
| | 868 | + } elseif ( $this->getVar( 'wgScriptPath' ) ) { |
| | 869 | + // Some kind soul has set it for us already (e.g. debconf) |
| 871 | 870 | return true; |
| 872 | 871 | } else { |
| 873 | 872 | $this->showError( 'config-no-uri' ); |
| — | — | @@ -1250,7 +1249,7 @@ |
| 1251 | 1250 | require( "$IP/includes/DefaultSettings.php" ); |
| 1252 | 1251 | |
| 1253 | 1252 | foreach( $exts as $e ) { |
| 1254 | | - require_once( "$IP/extensions/$e/$e.php" ); |
| | 1253 | + require_once( "$IP/extensions/$e/$e.php" ); |
| 1255 | 1254 | } |
| 1256 | 1255 | |
| 1257 | 1256 | $hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ? |