summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-21 15:30:03 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-21 15:30:03 -0400
commit9f07921b45190b462e1a798622068e24ef31e124 (patch)
tree45ba802a5aa64c44faa4319749220e266f9cf1ee /lib/common.php
parent041d2d82d3db92368913466869688cb5fa2554c8 (diff)
parenta8d35451823b01c074d5417a138d4968331a8130 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php
index 3fc047af9..6c4b856e0 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -82,7 +82,7 @@ if (isset($server)) {
if (isset($path)) {
$_path = $path;
} else {
- $_path = array_key_exists('SCRIPT_NAME', $_SERVER) ?
+ $_path = (array_key_exists('SERVER_NAME', $_SERVER) && array_key_exists('SCRIPT_NAME', $_SERVER)) ?
_sn_to_path($_SERVER['SCRIPT_NAME']) :
null;
}