roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r735693 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
Date Mon, 19 Jan 2009 14:02:03 GMT
Author: snoopdave
Date: Mon Jan 19 06:02:03 2009
New Revision: 735693

URL: http://svn.apache.org/viewvc?rev=735693&view=rev
Log:
Fix for https://issues.apache.org/roller/browse/ROL-1781
"Site-wide and weblog-specific blacklists not combined properly"

Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java?rev=735693&r1=735692&r2=735693&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java Mon
Jan 19 06:02:03 2009
@@ -435,7 +435,7 @@
         String weblogWords = blacklist;
         weblogWords = (weblogWords == null) ? "" : weblogWords;
         String siteWords = (addendum != null) ? addendum : "";
-        StringTokenizer toker = new StringTokenizer(siteWords + weblogWords,"\n");
+        StringTokenizer toker = new StringTokenizer(siteWords + "\n" + weblogWords, "\n");
         while (toker.hasMoreTokens()) {
             String token = toker.nextToken().trim();
             if (token.startsWith("#")) continue;



Mime
View raw message