From c2c1b4af951bc4ca17d305dd55520230c6e36de3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 29 Jul 2011 15:34:12 +0000
Subject: [PATCH] Fix mismatched tag in MS linefeed

---
 etemplate/inc/class.bo_merge.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index e367ccef55..46fb0faa0e 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -366,7 +366,7 @@ abstract class bo_merge
 				}
 				catch (Exception $e)
 				{
-echo $content;die();
+					error_log($e);
 					// Failed...
 				}
 			}
@@ -655,7 +655,6 @@ echo $content;die();
 				{
 					// replace </p> and <br /> with CRLF (remove <p> and CRLF)
 					$value = str_replace(array("\r","\n",'<p>','</p>','<br />'),array('','','',"\r\n","\r\n"),$value);
-					//$value = strip_tags($value);
 					$value = strip_tags($value,implode('',$replace_tags));
 				}
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
@@ -819,7 +818,7 @@ echo $content;die();
 					break;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-					$LF ='</w:r></w:p><w:r><w:t>';
+					$LF ='</w:t></w:r></w:p><w:p><w:r><w:t>';
 					break;
 				case 'application/xml';
 					$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';