Index: org/apache/portals/bridges/common/GenericServletPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portals-bridges/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java,v
retrieving revision 1.4
diff -u -r1.4 GenericServletPortlet.java
--- org/apache/portals/bridges/common/GenericServletPortlet.java	15 Nov 2004 05:58:32 -0000	1.4
+++ org/apache/portals/bridges/common/GenericServletPortlet.java	17 Jan 2005 22:48:15 -0000
@@ -261,9 +261,11 @@
     {
         String editPage = this.defaultEditPage;
         if (this.allowPreferences == true)
-        {
+        {                       
             PortletPreferences prefs = request.getPreferences();
-            if (prefs != null)
+            // Allow EditPage override by the request
+            editPage = request.getParameter(PARAM_EDIT_PAGE);
+            if (prefs != null && editPage == null)
             {
                 editPage = prefs.getValue(PARAM_EDIT_PAGE, this.defaultEditPage);
             }
@@ -291,8 +293,11 @@
         String helpPage = this.defaultHelpPage;
         if (this.allowPreferences == true)
         {
+
             PortletPreferences prefs = request.getPreferences();
-            if (prefs != null)
+            // Allow HelpPage override by the request
+            helpPage = request.getParameter(PARAM_EDIT_PAGE);
+            if (prefs != null && helpPage == null)
             {
                 helpPage = prefs.getValue(PARAM_HELP_PAGE, this.defaultHelpPage);
             }