L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-26044' of git://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-01-24 10:48:08 +01:00
parent 912d099cc9 27d6ab5712
commit 21c91e2e11
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+12 -6
View File
@@ -389,11 +389,13 @@ class moodle_url {
if (is_int($key)) {
throw new coding_exception('Url parameters can not have numeric keys!');
}
if (is_array($value)) {
throw new coding_exception('Url parameters values can not be arrays!');
}
if (is_object($value) and !method_exists($value, '__toString')) {
throw new coding_exception('Url parameters values can not be objects, unless __toString() is defined!');
if (!is_string($value)) {
if (is_array($value)) {
throw new coding_exception('Url parameters values can not be arrays!');
}
if (is_object($value) and !method_exists($value, '__toString')) {
throw new coding_exception('Url parameters values can not be objects, unless __toString() is defined!');
}
}
$this->params[$key] = (string)$value;
}
@@ -486,7 +488,11 @@ class moodle_url {
*/
public function get_query_string($escaped = true, array $overrideparams = null) {
$arr = array();
$params = $this->merge_overrideparams($overrideparams);
if ($overrideparams !== null) {
$params = $this->merge_overrideparams($overrideparams);
} else {
$params = $this->params;
}
foreach ($params as $key => $val) {
$arr[] = rawurlencode($key)."=".rawurlencode($val);
}