Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber 2011-01-04 12:14:08 -08:00
commit 6e894c010f

View File

@ -204,7 +204,7 @@ function main()
{ {
// fake HTTP redirects using lighttpd's 404 redirects // fake HTTP redirects using lighttpd's 404 redirects
if (strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') !== false) { if (strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') !== false) {
$_lighty_url = $base_url.$_SERVER['REQUEST_URI']; $_lighty_url = $_SERVER['REQUEST_URI'];
$_lighty_url = @parse_url($_lighty_url); $_lighty_url = @parse_url($_lighty_url);
if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') { if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {