MDL-15683, get query string instead of calling me(), merged from MOODLE_19_STABLE.

diff --git a/pix/smartpix.php b/pix/smartpix.php
index 39a3599b7a39c1e6cad184d6f005b04323b99eff..cb8c9b033244a1dbf631e56d8f769a5804e58927 100644 (file)
--- a/pix/smartpix.php
+++ b/pix/smartpix.php
@@ -36,7 +36,7 @@ function makesafe($param) {
  * @param string $url the url which may have a query string attached
  * @return string
  */
- function strip_querystring($url) {
+function strip_querystring($url) {
 
     if ($commapos = strpos($url, '?')) {
         return substr($url, 0, $commapos);
@@ -45,6 +45,16 @@ function makesafe($param) {
     }
 }
  
+// get query string
+function get_query($name) {
+    if (!empty($_SERVER['REQUEST_URI'])) {
+        return explode($name, $_SERVER['REQUEST_URI']);
+    } else if (!empty($_SERVER['QUERY_STRING'])) {
+        return array('', '?'. $_SERVER['QUERY_STRING']);
+    } else {
+        return false;
+    }
+}
 // Nicked from weblib then cutdown
 /**
  * Extracts file argument either from file parameter or PATH_INFO. 
@@ -70,7 +80,7 @@ function get_file_argument_limited($scriptname) {
 
     // now if both fail try the old way
     // (for compatibility with misconfigured or older buggy php implementations)
-    $arr = explode($scriptname, me());
+    $arr = get_query($scriptname);
     if (!empty($arr[1])) {
         return makesafe(rawurldecode(strip_querystring($arr[1])));
     }