You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/04/26 16:53:58 UTC
svn commit: r397211 - in /incubator/roller/trunk:
contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/
contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/
web/WEB-INF/classes/
Author: snoopdave
Date: Wed Apr 26 07:53:54 2006
New Revision: 397211
URL: http://svn.apache.org/viewcvs?rev=397211&view=rev
Log:
Couple more (plugin related) fixes to entry text/summary logic
Modified:
incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java
incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java?rev=397211&r1=397210&r2=397211&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java Wed Apr 26 07:53:54 2006
@@ -68,7 +68,7 @@
mLogger.debug("Rendering weblog entry: "+entry.getTitle());
- return this.render(entry.getText());
+ return this.render(str);
}
Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java?rev=397211&r1=397210&r2=397211&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java Wed Apr 26 07:53:54 2006
@@ -88,7 +88,7 @@
mLogger.warn("Unable to get pageLink", e);
}
- String result = Utilities.removeHTML(entry.getText(), true);
+ String result = Utilities.removeHTML(str, true);
result = Utilities.truncateText(result, 240, 260, "...");
//String result = Utilities.truncateNicely(entry.getText(), 240, 260, "... ");
Modified: incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/weblog.vm?rev=397211&r1=397210&r2=397211&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Wed Apr 26 07:53:54 2006
@@ -246,7 +246,7 @@
#if( $entry.plugins )
#set( $displayText = $pageHelper.renderPlugins($entry, $sourceText) )
#else
- #set( $displayText = $entry.text )
+ #set( $displayText = $sourceText )
#end
$utilities.textToCDATA($displayText)
#end