Permalink
Browse files

Merge branch 'MDL-31130_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
  • Loading branch information...
2 parents 94828be + 0a2569e commit 2d48474f2a6fd2c46d5c200f254a41add16e221b Sam Hemelryk committed Jan 16, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 question/editlib.php
View
4 question/editlib.php
@@ -1360,10 +1360,10 @@ protected function display_question_list($contexts, $pageurl, $categoryandcontex
echo $OUTPUT->render($pagingbar);
if ($totalnumber > DEFAULT_QUESTIONS_PER_PAGE) {
if ($perpage == DEFAULT_QUESTIONS_PER_PAGE) {
- $url = new moodle_url('edit.php', ($pageurl->params()+array('qperpage'=>1000)));
+ $url = new moodle_url('edit.php', array_merge($pageurl->params(), array('qperpage'=>1000)));
$showall = '<a href="'.$url.'">'.get_string('showall', 'moodle', $totalnumber).'</a>';
} else {
- $url = new moodle_url('edit.php', ($pageurl->params()+array('qperpage'=>DEFAULT_QUESTIONS_PER_PAGE)));
+ $url = new moodle_url('edit.php', array_merge($pageurl->params(), array('qperpage'=>DEFAULT_QUESTIONS_PER_PAGE)));
$showall = '<a href="'.$url.'">'.get_string('showperpage', 'moodle', DEFAULT_QUESTIONS_PER_PAGE).'</a>';
}
echo "<div class='paging'>$showall</div>";

0 comments on commit 2d48474

Please sign in to comment.