mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
reverting last commit "added another parameter to moodle_url out, out_action and get_query_string so that developer can output url with query string joined by '&' and not '&'. & breaks redirect on IE." It turned out to be unnecessary.
This commit is contained in:
parent
24a905f98b
commit
d65cb30f63
1 changed files with 6 additions and 6 deletions
|
@ -275,7 +275,7 @@ class moodle_list{
|
||||||
$html .= " $currentpage \n";
|
$html .= " $currentpage \n";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$html .= "<a href=\"".$this->pageurl->out('', false, array($this->pageparamname => $currentpage))."\">";
|
$html .= "<a href=\"".$this->pageurl->out(false, array($this->pageparamname => $currentpage))."\">";
|
||||||
$html .= " $currentpage </a>\n";
|
$html .= " $currentpage </a>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -429,7 +429,7 @@ class moodle_list{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
redirect($this->pageurl->out('&'));
|
redirect($this->pageurl->out());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -541,26 +541,26 @@ class list_item{
|
||||||
} else {
|
} else {
|
||||||
$action = $strmoveleft;
|
$action = $strmoveleft;
|
||||||
}
|
}
|
||||||
$icons['left'] = $this->image_icon($action, $this->parentlist->pageurl->out_action('', array('left'=>$this->id)), 'left');
|
$icons['left'] = $this->image_icon($action, $this->parentlist->pageurl->out_action(array('left'=>$this->id)), 'left');
|
||||||
} else {
|
} else {
|
||||||
$icons['left'] = $this->image_spacer();
|
$icons['left'] = $this->image_spacer();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$first) {
|
if (!$first) {
|
||||||
$icons['up'] = $this->image_icon($strmoveup, $this->parentlist->pageurl->out_action('', array('moveup'=>$this->id)), 'up');
|
$icons['up'] = $this->image_icon($strmoveup, $this->parentlist->pageurl->out_action(array('moveup'=>$this->id)), 'up');
|
||||||
} else {
|
} else {
|
||||||
$icons['up'] = $this->image_spacer();
|
$icons['up'] = $this->image_spacer();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$last) {
|
if (!$last) {
|
||||||
$icons['down'] = $this->image_icon($strmovedown, $this->parentlist->pageurl->out_action('', array('movedown'=>$this->id)), 'down');
|
$icons['down'] = $this->image_icon($strmovedown, $this->parentlist->pageurl->out_action(array('movedown'=>$this->id)), 'down');
|
||||||
} else {
|
} else {
|
||||||
$icons['down'] = $this->image_spacer();
|
$icons['down'] = $this->image_spacer();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($lastitem)) {
|
if (!empty($lastitem)) {
|
||||||
$makechildof = get_string('makechildof', 'question', $lastitem->name);
|
$makechildof = get_string('makechildof', 'question', $lastitem->name);
|
||||||
$icons['right'] = $this->image_icon($makechildof, $this->parentlist->pageurl->out_action('', array('right'=>$this->id)), 'right');
|
$icons['right'] = $this->image_icon($makechildof, $this->parentlist->pageurl->out_action(array('right'=>$this->id)), 'right');
|
||||||
} else {
|
} else {
|
||||||
$icons['right'] = $this->image_spacer();
|
$icons['right'] = $this->image_spacer();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue