Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-31130_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
  • Loading branch information
Sam Hemelryk committed Jan 16, 2012
2 parents 6b76395 + ee2e29d commit e333be5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions question/editlib.php
Expand Up @@ -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>";
Expand Down

0 comments on commit e333be5

Please sign in to comment.