g5 충돌 수정

2018-08-23 09:46:43 +09:00
parent 219677babb b1fc952c76
commit 5d462d55dc
34 changed files with 85 additions and 61 deletions
--- a/plugin/htmlpurifier/safeiframe.txt
+++ b/plugin/htmlpurifier/safeiframe.txt
@ -9,4 +9,6 @@ play.afreeca.com/
 v.nate.com/
 www.microsoft.com/showcase/video.aspx/
 w.soundcloud.com/
-www.facebook.com/
+www.facebook.com/
+kakaotv.daum.net/
+v.afree.ca/
--- a/plugin/sns/view.sns.skin.php
+++ b/plugin/sns/view.sns.skin.php
@ -23,7 +23,7 @@ $gplus_url    = $sns_send.'&amp;sns=gplus';
 ?>

 <?php if(G5_IS_MOBILE && $config['cf_kakao_js_apikey']) { ?>
-<script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
+<script src="//developers.kakao.com/sdk/js/kakao.min.js"></script>
 <script src="<?php echo G5_JS_URL; ?>/kakaolink.js"></script>
 <script>
    // 사용할 앱의 Javascript 키를 설정해 주세요.