From 54abbddbe5f74e0d9ed1efe11b553bc6b89e548f Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 20 Mar 2017 15:46:58 +0900
Subject: [PATCH] =?UTF-8?q?cheditor=20=EC=86=8C=EC=8A=A4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.sub.php                                    | 2 +-
 plugin/editor/cheditor5/popup/js/image.html5.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/head.sub.php b/head.sub.php
index fc658d1aa..dc5664636 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -45,7 +45,7 @@ if (G5_IS_MOBILE) {
     echo '<meta name="format-detection" content="telephone=no">'.PHP_EOL;
 } else {
     echo '<meta http-equiv="imagetoolbar" content="no">'.PHP_EOL;
-    echo '<meta http-equiv="X-UA-Compatible" content="IE=10,chrome=1">'.PHP_EOL;
+    echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge">'.PHP_EOL;
 }
 
 if($config['cf_add_meta'])
diff --git a/plugin/editor/cheditor5/popup/js/image.html5.js b/plugin/editor/cheditor5/popup/js/image.html5.js
index b4ed00b0e..fc97d6cd0 100644
--- a/plugin/editor/cheditor5/popup/js/image.html5.js
+++ b/plugin/editor/cheditor5/popup/js/image.html5.js
@@ -1064,7 +1064,11 @@ DoUpload.prototype = {
 
         if (evt.target.readyState === FileReader.DONE) {
             blob = new self.MyBlob(self.NewBlob(evt.target.result, filetype));
-            orientation = self.getOrientation(evt.target.result.slice(0, 64 * 1024));
+            try {
+                orientation = self.getOrientation(evt.target.result.slice(0, 64 * 1024));
+            } catch(err) {
+
+            }
             image = new Image();
 
             image.onload = function () {