From d79bdc5b19ba10326ad92876b0eb65ead5b5d6da Mon Sep 17 00:00:00 2001
From: Mark Baker <mbaker@inviqa.com>
Date: Sun, 24 Mar 2013 21:56:06 +0000
Subject: [PATCH] iconv rather than mbstring for convert encoding

---
 Classes/PHPExcel/Shared/String.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Classes/PHPExcel/Shared/String.php b/Classes/PHPExcel/Shared/String.php
index 31e2ef3..3897433 100644
--- a/Classes/PHPExcel/Shared/String.php
+++ b/Classes/PHPExcel/Shared/String.php
@@ -491,14 +491,14 @@ class PHPExcel_Shared_String
 	 */
 	public static function ConvertEncoding($value, $to, $from)
 	{
-		if (self::getIsMbstringEnabled()) {
-			return mb_convert_encoding($value, $to, $from);
-		}
-
 		if (self::getIsIconvEnabled()) {
 			return iconv($from, $to, $value);
 		}
 
+		if (self::getIsMbstringEnabled()) {
+			return mb_convert_encoding($value, $to, $from);
+		}
+
 		if($from == 'UTF-16LE'){
 			return self::utf16_decode($value, false);
 		}else if($from == 'UTF-16BE'){