From dff2578df315785d5490ef9b5c015ca669f78e5c Mon Sep 17 00:00:00 2001
From: YJSoft <YJSoft@users.noreply.github.com>
Date: Sun, 6 Mar 2016 21:08:16 +0900
Subject: [PATCH] =?UTF-8?q?HTTPS=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=EB=8A=94=20=EA=B8=B4=20=EC=A3=BC=EC=86=8C=EB=A5=BC=20?=
 =?UTF-8?q?=ED=92=80=EC=A7=80=20=EC=95=8A=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/oembed/jquery.oembed.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/oembed/jquery.oembed.js b/addons/oembed/jquery.oembed.js
index 496d689af..1bafb620e 100755
--- a/addons/oembed/jquery.oembed.js
+++ b/addons/oembed/jquery.oembed.js
@@ -56,8 +56,10 @@
                 //Check if shorten URL
                 for (var j = 0, l = shortURLList.length; j < l; j++) {
                     var regExp = new RegExp('://' + shortURLList[j] + '/', "i");
+                    
+                    provider = $.fn.oembed.getOEmbedProvider(resourceURL);
 
-                    if (resourceURL.match(regExp) !== null) {
+                    if (!provider && window.location.protocol !== "https:" && resourceURL.match(regExp) !== null) {
                         //AJAX to http://api.longurl.org/v2/expand?url=http://bit.ly/JATvIs&format=json&callback=hhh
                         var ajaxopts = $.extend({
                             url: "http://api.longurl.org/v2/expand",
@@ -96,7 +98,6 @@
                         return container;
                     }
                 }
-                provider = $.fn.oembed.getOEmbedProvider(resourceURL);
 
                 //remove fallback
                 if (!!settings.fallback === false) {