From 93a67089b5c7192b52c05c0c2e9d8b4540ba6d4f Mon Sep 17 00:00:00 2001
From: Rheal Poirier <rheal@mf1.ca>
Date: Tue, 7 Feb 2012 10:57:07 -0600
Subject: [PATCH 1/4] Added htmlspecialchars() to html section in loop-single

---
 loop-single.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loop-single.php b/loop-single.php
index 4387f98..17846e6 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -35,7 +35,7 @@
 			<div id="markup" class="mod">
 				<h3 class="label">HTML</h3> <a href="#" class="clip" title="select code for copying"><img src="/wp-content/themes/pears/images/icon-copy.png" alt="copy" /></a>
 				<textarea class="mod-ta">
-<?php $key="html"; echo get_post_meta($post->ID, $key, true); ?>			
+<?php $key="html"; echo htmlspecialchars(get_post_meta($post->ID, $key, true)); ?>			
 				</textarea>
 			</div>
 			

From c894a973ceec1ebb59782535d716e69dbe853f6b Mon Sep 17 00:00:00 2001
From: Rheal Poirier <rheal@mf1.ca>
Date: Tue, 7 Feb 2012 10:57:07 -0600
Subject: [PATCH 2/4] Added htmlspecialchars() to html section in loop-single

---
 loop-single.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loop-single.php b/loop-single.php
index 4387f98..17846e6 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -35,7 +35,7 @@
 			<div id="markup" class="mod">
 				<h3 class="label">HTML</h3> <a href="#" class="clip" title="select code for copying"><img src="/wp-content/themes/pears/images/icon-copy.png" alt="copy" /></a>
 				<textarea class="mod-ta">
-<?php $key="html"; echo get_post_meta($post->ID, $key, true); ?>			
+<?php $key="html"; echo htmlspecialchars(get_post_meta($post->ID, $key, true)); ?>			
 				</textarea>
 			</div>
 			

From be814a3b45ede2607c926330dacdaa6733f3967d Mon Sep 17 00:00:00 2001
From: Rheal Poirier <rheal@mf1.ca>
Date: Fri, 9 Mar 2012 15:08:20 -0600
Subject: [PATCH 3/4] added exc_textarea instead of htmlspecialchars as per
 @Mamaduka

---
 loop-single.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loop-single.php b/loop-single.php
index 17846e6..fddbf15 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -35,7 +35,7 @@
 			<div id="markup" class="mod">
 				<h3 class="label">HTML</h3> <a href="#" class="clip" title="select code for copying"><img src="/wp-content/themes/pears/images/icon-copy.png" alt="copy" /></a>
 				<textarea class="mod-ta">
-<?php $key="html"; echo htmlspecialchars(get_post_meta($post->ID, $key, true)); ?>			
+<?php $key="html"; echo esc_textarea(get_post_meta($post->ID, $key, true)); ?>			
 				</textarea>
 			</div>
 			

From 055d5eb057f4a56a9115b5b604bdf5029589dd28 Mon Sep 17 00:00:00 2001
From: Rheal Poirier <rheal@mf1.ca>
Date: Fri, 9 Mar 2012 15:17:04 -0600
Subject: [PATCH 4/4] update from source

---
 loop-single.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/loop-single.php b/loop-single.php
index c957ea1..f3877b3 100644
--- a/loop-single.php
+++ b/loop-single.php
@@ -35,11 +35,7 @@
 			<div id="markup" class="mod">
 				<h3 class="label">HTML</h3> <a href="#" class="clip" title="select code for copying"><img src="<?php bloginfo('template_directory'); ?>/images/icon-copy.png" alt="copy" /></a>
 				<textarea class="mod-ta">
-<<<<<<< HEAD
 <?php $key="html"; echo esc_textarea(get_post_meta($post->ID, $key, true)); ?>			
-=======
-<?php $key="html"; echo htmlspecialchars(get_post_meta($post->ID, $key, true)); ?>			
->>>>>>> 7280847a0bd72abbbdb8c08dba0879ccfc71e3aa
 				</textarea>
 			</div>