dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a124b70
)
Follow-up to r64937: expand ternary to conditionals because I hate nested ternaries.
author
Andrew Garrett
<werdna@users.mediawiki.org>
Thu, 9 Dec 2010 03:12:28 +0000
(
03:12
+0000)
committer
Andrew Garrett
<werdna@users.mediawiki.org>
Thu, 9 Dec 2010 03:12:28 +0000
(
03:12
+0000)
includes/Setup.php
patch
|
blob
|
history
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
7c9fa49
..
d28b339
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-217,9
+217,14
@@
if ( $wgCommandLineMode ) {
wfDebug( "Start request\n\n" );
# Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
# so use an alternative
wfDebug( "Start request\n\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'] );
+ if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+ $requestUri = $_SERVER['REQUEST_URI'];
+ } elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+ $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+ } else {
+ $requestUri = $_SERVER['PHP_SELF'];
+ }
+
wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
if ( $wgDebugPrintHttpHeaders ) {
wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
if ( $wgDebugPrintHttpHeaders ) {