From d2969a7fa4188247baf0c0585878982c680badcb Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 27 Nov 2008 01:43:22 +0000
Subject: [PATCH] BUGFIX If WYSIWYG editing enabled, don't attempt to parse the
 content, just return the HTML instead MINOR HTML code formatting in
 BlogEntry.ss

---
 templates/Layout/BlogEntry.ss | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/templates/Layout/BlogEntry.ss b/templates/Layout/BlogEntry.ss
index 9551141..d5c2bfb 100644
--- a/templates/Layout/BlogEntry.ss
+++ b/templates/Layout/BlogEntry.ss
@@ -3,18 +3,22 @@
 	<% include BreadCrumbs %>
 	
 	<div class="blogEntry">
-			<h2>$Title</h2>
-			<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.Long | $Comments.Count <% _t('COMMENTS', 'Comments') %></p>
-				<% if TagsCollection %>
-					<p class="tags">
-						 <% _t('TAGS', 'Tags:') %> 
-						<% control TagsCollection %>
-							<a href="$Link" title="<% _t('VIEWALLPOSTTAGGED', 'View all posts tagged') %> '$Tag'" rel="tag">$Tag</a><% if Last %><% else %>,<% end_if %>
-						<% end_control %>
-					</p>
-				<% end_if %>
+		<h2>$Title</h2>
+		<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.Long | $Comments.Count <% _t('COMMENTS', 'Comments') %></p>
+		<% if TagsCollection %>
+			<p class="tags">
+				 <% _t('TAGS', 'Tags:') %> 
+				<% control TagsCollection %>
+					<a href="$Link" title="<% _t('VIEWALLPOSTTAGGED', 'View all posts tagged') %> '$Tag'" rel="tag">$Tag</a><% if Last %><% else %>,<% end_if %>
+				<% end_control %>
+			</p>
+		<% end_if %>
+		<% if IsWYSIWYGEnabled %>
+			$Content
+		<% else %>
 			$ParsedContent
-			<br />
+		<% end_if %>
+		<br />
 	</div>
 	
 	<% if CurrentMember %><p><a href="$EditURL" id="editpost" title="<% _t('EDITTHIS', 'Edit this post') %>"><% _t('EDITTHIS', 'Edit this post') %></a> | <a href="$Link(unpublishPost)" id="unpublishpost"><% _t('UNPUBLISHTHIS', 'Unpublish this post') %></a></p><% end_if %>