roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r395026 - /incubator/roller/trunk/web/WEB-INF/classes/weblog.vm
Date Tue, 18 Apr 2006 20:24:15 GMT
Author: snoopdave
Date: Tue Apr 18 13:24:14 2006
New Revision: 395026

URL: http://svn.apache.org/viewcvs?rev=395026&view=rev
Log:
Error in summary rendering

Modified:
    incubator/roller/trunk/web/WEB-INF/classes/weblog.vm

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=395026&r1=395025&r2=395026&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/weblog.vm Tue Apr 18 13:24:14 2006
@@ -257,44 +257,36 @@
  * Roller uses this macro to display entry.summary in RSS and Atom feeds.
  *#
 #macro( showEntrySummary $entry )
-   #if($descPage)
-      #parse($descPage.id)
-   #else
-      #if( $entry.plugins)
-         #set( $displayText = $pageHelper.renderPlugins( $entry, $entry.summary))
-      #else
-         #set( $displayText = $entry.summary )
-      #end
-      #if( $displayText == -1 )
-        $utilities.textToXML($displayText)
-      #else
-        #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
-        #set( $displayText = $utilities.textToXML($utilities.removeHTML($displayText)) )
-        $displayText... [$entry.text.length() characters]
-      #end
-   #end
+  #if( $entry.plugins)
+     #set( $displayText = $pageHelper.renderPlugins($entry, $entry.summary))
+  #else
+     #set( $displayText = $entry.summary )
+  #end
+  #if( $entryLength == -1 )
+     $utilities.textToXML($displayText)
+  #else
+     #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
+     #set( $displayText = $utilities.textToXML($utilities.removeHTML($displayText)) )
+     $displayText... [$entry.text.length() characters]
+  #end
 #end
 
 #**
  * Roller uses this macro to display entry.text in RSS and Atom feeds.
  *#
 #macro( showEntryContent $entry )
-   #if($descPage)
-      #parse($descPage.id)
-   #else
-      #if( $entry.plugins)
-         #set( $displayText = $pageHelper.renderPlugins( $entry, $entry.text))
-      #else
-         #set( $displayText = $entry.text )
-      #end
-      #if( $entryLength == -1 )
-        $utilities.textToXML($displayText)
-      #else
-        #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
-        #set( $displayText = $utilities.textToXML($utilities.removeHTML($displayText)) )
-        $displayText... [$entry.text.length() characters]
-      #end
-   #end
+  #if( $entry.plugins)
+     #set( $displayText = $pageHelper.renderPlugins( $entry, $entry.text))
+  #else
+     #set( $displayText = $entry.text )
+  #end
+  #if( $entryLength == -1 )
+    $utilities.textToXML($displayText)
+  #else
+    #set( $displayText = $stringUtils.left( $displayText, $entryLength ) )
+    #set( $displayText = $utilities.textToXML($utilities.removeHTML($displayText)) )
+    $displayText... [$entry.text.length() characters]
+  #end
 #end
 
 



Mime
View raw message