Author: rgoers Date: Wed Jan 5 15:12:03 2005 New Revision: 124299 URL: http://svn.apache.org/viewcvs?view=rev&rev=124299 Log: Fix bug 32838 - PageLabel urls were not properly encoded.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java?view=diff&rev=124299&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java&r1=124298&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java&r2=124299 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java Wed Jan 5 15:12:03 2005 @@ -88,8 +88,13 @@ else { buffer.append('?'); } - buffer.append(requestParameterName).append('=') - .append(SourceUtil.encode(key.toString())); + String encodedKey; + try { + encodedKey = SourceUtil.encode(key.toString(), "utf-8"); + } catch (Exception ex) { + encodedKey = SourceUtil.encode(key.toString()); + } + buffer.append(requestParameterName).append('=').append(encodedKey); return buffer.toString(); } } @@ -112,7 +117,7 @@ return this.getRefreshLinkURI(); } if (this.labelManager == null) { - super.getLinkURI(events); + return super.getLinkURI(events); } String requestParameterName = this.labelManager.getRequestParameterName(); @@ -224,7 +229,14 @@ } else { uri.append('?'); } - uri.append(parmName).append('=').append(SourceUtil.encode(label)); + String encodedLabel; + try { + encodedLabel = SourceUtil.encode(label.toString(), "utf-8"); + } + catch (Exception e) { + encodedLabel = SourceUtil.encode(label.toString()); + } + uri.append(parmName).append('=').append(encodedLabel); return uri.toString(); } } Modified: cocoon/branches/BRANCH_2_1_X/status.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=124299&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=124298&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=124299 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Jan 5 15:12:03 2005 @@ -202,6 +202,9 @@ <changes> <release version="@version@" date="@date@"> + <action dev="RG" type="fix" fixes-bug="32838" due-to="Roy Huang" due-to-email="[EMAIL PROTECTED]"> + PageLabel url's were not properly encoded. + </action> <action dev="AG" type="update"> Updated quartz to 1.4.3, nekodtd to 0.1.11, nekohtml to 0.9.4 castor to 0.9.5.4, commons-digester to 1.6, groovy to 1.0-beta-8, asm to 1.5.2
