Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)
auth/cas/CAS/CAS.php

index 975c0e5..f9c60fa 100644 (file)
@@ -32,8 +32,9 @@
 //\r
 // hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS\r
 //\r
-if (!isset($_SERVER['REQUEST_URI'])) {\r
-       $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'];\r
+$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];\r
+if (isset($_SERVER['QUERY_STRING'])) {\r
+    $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];\r
 }\r
 \r
 //\r