From a2c4671e33c47bdd1211b7434efb5a98381e4981 Mon Sep 17 00:00:00 2001 From: skodak <skodak> Date: Sun, 15 Apr 2007 16:09:55 +0000 Subject: [PATCH] MDL-9311 participants - duplicate "&perpage="; merged from MOODLE_18_STABLE --- user/index.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user/index.php b/user/index.php index eaa014de3c..cd3753d121 100644 --- a/user/index.php +++ b/user/index.php @@ -622,11 +622,12 @@ echo '<input type="text" name="search" value="'.$search.'" /> <input type="submit" value="'.get_string('search').'" /></div></form>'."\n"; } + $perpageurl = preg_replace('/&perpage=\d*/','', $baseurl); if ($perpage == SHOW_ALL_PAGE_SIZE) { - echo '<div id="showall"><a href="'.$baseurl.'&perpage='.DEFAULT_PAGE_SIZE.'">'.get_string('showperpage', '', DEFAULT_PAGE_SIZE).'</a></div>'; + echo '<div id="showall"><a href="'.$perpageurl.'&perpage='.DEFAULT_PAGE_SIZE.'">'.get_string('showperpage', '', DEFAULT_PAGE_SIZE).'</a></div>'; } else if ($matchcount > 0 && $perpage < $matchcount) { - echo '<div id="showall"><a href="'.$baseurl.'&perpage='.SHOW_ALL_PAGE_SIZE.'">'.get_string('showall', '', $matchcount).'</a></div>'; + echo '<div id="showall"><a href="'.$perpageurl.'&perpage='.SHOW_ALL_PAGE_SIZE.'">'.get_string('showall', '', $matchcount).'</a></div>'; } print_footer($course); -- 2.39.5