Merge branch 'MDL-31130_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE

This commit is contained in:
Sam Hemelryk
2012-01-16 11:46:10 +08:00
+2 -2
View File
@@ -1360,10 +1360,10 @@ class question_bank_view {
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>";