From a949c32b4c371f21369aafd0e4277bd16e0fc704 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 20 Jun 2014 13:37:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/newwinform.php    | 2 +-
 bbs/sns_send.php      | 4 ++--
 bbs/write_update.php  | 2 +-
 head.sub.php          | 5 -----
 js/viewimageresize.js | 3 +++
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/adm/newwinform.php b/adm/newwinform.php
index 9a288b51c..9fb2452db 100644
--- a/adm/newwinform.php
+++ b/adm/newwinform.php
@@ -34,7 +34,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 <input type="hidden" name="nw_id" value="<?php echo $nw_id; ?>">
 
 <div class="local_desc01 local_desc">
-    <p>쇼핑몰 초기화면 접속 시 자동으로 뜰 팝업레이어를 설정합니다.</p>
+    <p>초기화면 접속 시 자동으로 뜰 팝업레이어를 설정합니다.</p>
 </div>
 
 <div class="tbl_frm01 tbl_wrap">
diff --git a/bbs/sns_send.php b/bbs/sns_send.php
index 1e9b225db..64097ebdd 100644
--- a/bbs/sns_send.php
+++ b/bbs/sns_send.php
@@ -1,13 +1,13 @@
 <?php
 include_once("./_common.php");
 
-$title    =  str_replace('\"', '"',$_REQUEST['title']);
+$title    =  urlencode(str_replace('\"', '"',$_REQUEST['title']));
 $short_url = googl_short_url($_REQUEST['longurl']);
 $title_url = $title.' : '.$short_url;
 
 switch($_REQUEST['sns']) {
     case 'facebook' :
-        header("Location:http://www.facebook.com/sharer/sharer.php?s=100&p[url]=".$short_url."&p[title]=".$title);
+        header("Location:http://www.facebook.com/sharer/sharer.php?s=100&u=".$short_url."&p=".$title);
         break;
     case 'twitter' :
         header("Location:http://twitter.com/home?status=".$title_url);
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 6fef84dc1..7855dfc88 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -90,7 +90,7 @@ if (isset($_POST['notice']) && $_POST['notice']) {
 for ($i=1; $i<=10; $i++) {
     $var = "wr_$i";
     $$var = "";
-    if (isset($_POST['wr_'.$i]) && $_POST['wr_'.$i]) {
+    if (isset($_POST['wr_'.$i]) && settype($_POST['wr_'.$i], 'string')) {
         $$var = trim($_POST['wr_'.$i]);
     }
 }
diff --git a/head.sub.php b/head.sub.php
index 246d863c2..027150bf6 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -51,11 +51,6 @@ if (defined('G5_IS_ADMIN')) {
     echo '<link rel="stylesheet" href="'.G5_ADMIN_URL.'/css/admin.css">'.PHP_EOL;
 } else {
     echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
-    // canonical 지정
-    $canonical = '';
-    if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER['HTTP_HOST'].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
-    else $canonical = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
-    echo '<link rel="canonical" href="'.$canonical.'">'.PHP_EOL;
 }
 ?>
 <!--[if lte IE 8]>
diff --git a/js/viewimageresize.js b/js/viewimageresize.js
index 7b9a1eaf7..382cccf5c 100644
--- a/js/viewimageresize.js
+++ b/js/viewimageresize.js
@@ -16,6 +16,9 @@
         var $img = this.find(cfg.selector);
         var $this = this;
 
+        $img.removeAttr("height")
+            .css("height", "");
+
         function image_resize()
         {
             var width = $this.width();