From: skodak <skodak>
Date: Sun, 15 Apr 2007 16:09:55 +0000 (+0000)
Subject: MDL-9311  participants - duplicate "&perpage="; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a2c4671e33c47bdd1211b7434efb5a98381e4981;p=moodle.git

MDL-9311  participants - duplicate "&perpage="; merged from MOODLE_18_STABLE
---

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.'" />&nbsp;<input type="submit" value="'.get_string('search').'" /></div></form>'."\n";
     }
 
+    $perpageurl = preg_replace('/&amp;perpage=\d*/','', $baseurl);
     if ($perpage == SHOW_ALL_PAGE_SIZE) {
-        echo '<div id="showall"><a href="'.$baseurl.'&amp;perpage='.DEFAULT_PAGE_SIZE.'">'.get_string('showperpage', '', DEFAULT_PAGE_SIZE).'</a></div>';
+        echo '<div id="showall"><a href="'.$perpageurl.'&amp;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.'&amp;perpage='.SHOW_ALL_PAGE_SIZE.'">'.get_string('showall', '', $matchcount).'</a></div>';
+        echo '<div id="showall"><a href="'.$perpageurl.'&amp;perpage='.SHOW_ALL_PAGE_SIZE.'">'.get_string('showall', '', $matchcount).'</a></div>';
     }
 
     print_footer($course);