Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv30701

Modified Files:
      Tag: MMBase-1_8
        UrlTag.java 
Log Message:
MMB-1599


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
See also: http://www.mmbase.org/jira/browse/MMB-1599


Index: UrlTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/UrlTag.java,v
retrieving revision 1.79.2.4
retrieving revision 1.79.2.5
diff -u -b -r1.79.2.4 -r1.79.2.5
--- UrlTag.java 29 Nov 2007 16:35:44 -0000      1.79.2.4
+++ UrlTag.java 19 Feb 2008 15:12:04 -0000      1.79.2.5
@@ -34,7 +34,7 @@
  * A Tag to produce an URL with parameters. It can use 'context' parameters 
easily.
  *
  * @author Michiel Meeuwissen
- * @version $Id: UrlTag.java,v 1.79.2.4 2007/11/29 16:35:44 michiel Exp $
+ * @version $Id: UrlTag.java,v 1.79.2.5 2008/02/19 15:12:04 michiel Exp $
  */
 
 public class UrlTag extends CloudReferrerTag  implements  ParamHandler {
@@ -205,8 +205,11 @@
             }
         } else {
             String page = getPage(getPage());
+            if (writeamp) {
+                page = page.replaceAll("&", "&");
+            }
             javax.servlet.http.HttpServletRequest req = 
(javax.servlet.http.HttpServletRequest) pageContext.getRequest();
-            if (page.equals("")) { // means _this_ page
+            if ("".equals(page)) { // means _this_ page
                 String requestURI = req.getRequestURI();
                 if (requestURI.endsWith("/")) {
                     page = ".";
@@ -246,6 +249,9 @@
                 connector = amp;
             }
         }
+        if (log.isDebugEnabled()) {
+            log.debug("appending " + extraParameters + " to " + show);
+        }
         Iterator i = extraParameters.iterator();
         while (i.hasNext()) {
             Entry param  = (Entry) i.next();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to