MDL-48010 grade import from URL: don't corrupt the URL.

diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php
index 4bd2d74..cdb537f 100644 (file)
--- a/grade/import/xml/import.php
+++ b/grade/import/xml/import.php
@@ -19,11 +19,11 @@ require_once '../../../config.php';
 require_once 'lib.php';
 require_once $CFG->libdir.'/filelib.php';
 
-$url       = required_param('url', PARAM_URL); // only real urls here
+$gradesurl = required_param('url', PARAM_URL); // only real urls here
 $id        = required_param('id', PARAM_INT); // course id
 $feedback  = optional_param('feedback', 0, PARAM_BOOL);
 
-$url = new moodle_url('/grade/import/xml/import.php', array('id'=>$id,'url'=>$url));
+$url = new moodle_url('/grade/import/xml/import.php', array('id' => $id,'url' => $gradesurl));
 if ($feedback !== 0) {
     $url->param('feedback', $feedback);
 }
@@ -46,10 +46,10 @@ require_capability('gradeimport/xml:view', $context);
 core_php_time_limit::raise();
 raise_memory_limit(MEMORY_EXTRA);
 
-$text = download_file_content($url);
+$text = download_file_content($gradesurl);
 if ($text === false) {
     print_error('cannotreadfile', 'error',
-            $CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $url);
+            $CFG->wwwroot . '/grade/import/xml/index.php?id=' . $id, $gradesurl);
 }
 
 $error = '';