Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MDL-31130 question bank: toggling show all / 20 per page broken.

  • Loading branch information...
commit ee2e29d19ed70ec1e2324367f9c23610b84893a2 1 parent c1dc3a5
Jonathon Fowler authored January 12, 2012 timhunt committed January 12, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  question/editlib.php
4  question/editlib.php
@@ -1360,10 +1360,10 @@ protected function display_question_list($contexts, $pageurl, $categoryandcontex
1360 1360
         echo $OUTPUT->render($pagingbar);
1361 1361
         if ($totalnumber > DEFAULT_QUESTIONS_PER_PAGE) {
1362 1362
             if ($perpage == DEFAULT_QUESTIONS_PER_PAGE) {
1363  
-                $url = new moodle_url('edit.php', ($pageurl->params()+array('qperpage'=>1000)));
  1363
+                $url = new moodle_url('edit.php', array_merge($pageurl->params(), array('qperpage'=>1000)));
1364 1364
                 $showall = '<a href="'.$url.'">'.get_string('showall', 'moodle', $totalnumber).'</a>';
1365 1365
             } else {
1366  
-                $url = new moodle_url('edit.php', ($pageurl->params()+array('qperpage'=>DEFAULT_QUESTIONS_PER_PAGE)));
  1366
+                $url = new moodle_url('edit.php', array_merge($pageurl->params(), array('qperpage'=>DEFAULT_QUESTIONS_PER_PAGE)));
1367 1367
                 $showall = '<a href="'.$url.'">'.get_string('showperpage', 'moodle', DEFAULT_QUESTIONS_PER_PAGE).'</a>';
1368 1368
             }
1369 1369
             echo "<div class='paging'>$showall</div>";

0 notes on commit ee2e29d

Please sign in to comment.
Something went wrong with that request. Please try again.