Changeset 1573

Show
Ignore:
Timestamp:
03/26/08 14:38:54 (7 months ago)
Author:
misja
Message:

Misja Hoebe <misja@curverider.co.uk> Applied attachment:ticket:327:080305_elggadmin_parse_uri_fix.diff, closes #327

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • devel/mod/elggadmin/lib/engine.inc.php

    r1539 r1573  
    9191// ported from mediawiki  
    9292function elggadmin_requested_url() { 
    93     if (isset($_SERVER['REQUEST_URI'])) { 
     93    if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // IIS 
     94        $base = $_SERVER['HTTP_X_REWRITE_URL']; 
     95    } elseif (isset($_SERVER['REQUEST_URI'])) { 
    9496        $base = $_SERVER['REQUEST_URI']; 
     97    } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // php as cgi 
     98        $base = $_SERVER['ORIG_PATH_INFO']; 
     99        if (!empty($_SERVER['QUERY_STRING'])) { 
     100            $base .= '?' . $_SERVER['QUERY_STRING']; 
     101        } 
    95102    } elseif (isset($_SERVER['SCRIPT_NAME'])) { 
    96103        //IIS?