Index: UserBrowserAction.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java,v
retrieving revision 1.12
diff -u -r1.12 UserBrowserAction.java
--- UserBrowserAction.java	13 Aug 2003 04:18:17 -0000	1.12
+++ UserBrowserAction.java	9 Nov 2003 17:44:12 -0000
@@ -68,6 +68,7 @@
 import org.apache.jetspeed.services.logging.JetspeedLogger;
 import org.apache.jetspeed.services.security.JetspeedSecurityException;
 import org.apache.jetspeed.services.resources.JetspeedResources;
+import org.apache.jetspeed.util.template.JetspeedLink;
 import org.apache.jetspeed.om.security.JetspeedUser;
 
 // jetspeed velocity
@@ -252,7 +253,14 @@
                     }
                     else
                     {
-                    pageLinks.append("[ <a href=./portal/"+DISPLAY_PAGE+"/" + i + ">" + i + "</a> ] &nbsp;");
+//						make sure the page navigation always points to 
+//						the right pane
+						Object jslink = context.get("jslink");
+						if (jslink instanceof JetspeedLink) {
+						 pageLinks.append("[ <a href=\"" + ((JetspeedLink)jslink).getPaneByName("UserBrowser").addQueryData(DISPLAY_PAGE, new Integer(i)).toString() + "\">" + i + "</a> ] &nbsp;");
+						} else {
+						 pageLinks.append("[ <a href=\"./portal/" + DISPLAY_PAGE + "/" + i + "\">" + i + "</a> ] &nbsp;");
+						}
                     }
                 }
                 context.put("pagelinks", pageLinks);