fixing r65339 which broke Upload when file dest was undefined

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 5642266..b37fb5e 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -182,25 +182,30 @@ if ( $wgCommandLineMode ) {
        wfDebug( "\n\nStart command line script $self\n" );
 } else {
        wfDebug( "Start request\n\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
-       $header_out = "HTTP HEADERS:\n";
-
-       if ( function_exists( 'getallheaders' ) ) {
-               $headers = getallheaders();
-               foreach ( $headers as $name => $value ) {
-                       $header_out .= "$name: $value\n";
-               }
-       } else {
-               $headers = $_SERVER;
-               foreach ( $headers as $name => $value ) {
-                       if ( substr( $name, 0, 5 ) !== 'HTTP_' ) continue;
-                       $name = substr( $name, 5 );
-                       $header_out .= "$name: $value\n";
-               }
-       }
+       # Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
+       # so use an alternative
+       $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : 
+               ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] :
+               $_SERVER['PHP_SELF'] );
+       wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
 
        if ( $wgDebugPrintHttpHeaders ) {
-               wfDebug( "$header_out\n" );
+               $headerOut = "HTTP HEADERS:\n";
+
+               if ( function_exists( 'getallheaders' ) ) {
+                       $headers = getallheaders();
+                       foreach ( $headers as $name => $value ) {
+                               $headerOut .= "$name: $value\n";
+                       }
+               } else {
+                       $headers = $_SERVER;
+                       foreach ( $headers as $name => $value ) {
+                               if ( substr( $name, 0, 5 ) !== 'HTTP_' ) continue;
+                               $name = substr( $name, 5 );
+                               $headerOut .= "$name: $value\n";
+                       }
+               }
+               wfDebug( "$headerOut\n" );
        }
 }