You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/08/10 01:23:07 UTC
svn commit: r430185 -
/incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java
Author: agilliland
Date: Wed Aug 9 16:23:06 2006
New Revision: 430185
URL: http://svn.apache.org/viewvc?rev=430185&view=rev
Log:
make sure that we only include categories in urls when they have a value.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java?rev=430185&r1=430184&r2=430185&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/util/URLUtilities.java Wed Aug 9 16:23:06 2006
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.pojos.WebsiteData;
@@ -151,20 +152,20 @@
pathinfo.append(getWeblogURL(weblog, locale, absolute));
- if(category != null && dateString == null) {
- String cat = category;
- if(category.startsWith("/")) {
- cat = category.substring(1);
- }
-
+ String cat = (StringUtils.isNotEmpty(category)) ? category : null;
+ if(cat != null && cat.startsWith("/")) {
+ cat = cat.substring(1);
+ }
+
+ if(cat != null && dateString == null) {
pathinfo.append("category/").append(encode(cat));
- } else if(dateString != null && category == null) {
+ } else if(dateString != null && cat == null) {
pathinfo.append("date/").append(dateString);
} else {
if(dateString != null) params.put("date", dateString);
- if(category != null) params.put("cat", encode(category));
+ if(category != null) params.put("cat", encode(cat));
}
if(pageNum > 0) {