From 8f5f3347623824ae564a325461bc230a1b095b5a Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 17 Aug 2011 15:47:05 +0000
Subject: [PATCH] Only process HTML inside Word xml documents

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

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 448cbbf5fc..c22ed4e585 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -359,9 +359,9 @@ abstract class bo_merge
 
 //echo $content;die();
 				break;
+			case 'application/xmlWord.Document':	// Word 2003*/
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms office 2007
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-			case 'application/xml':
 				$replace_tags = array(
 					'b','strong','i','em','u','span'
 				);
@@ -639,9 +639,9 @@ abstract class bo_merge
 						'<table>','<tr>','<td>',
 					);
 					break;
+				case 'application/xmlWord.Document':	// Word 2003*/
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms office 2007
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-				case 'application/xml':
 					$replace_tags = array(
 						'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
 						'<table>','<tr>','<td>',