From 5b087f32bff4cdf829d603500ca1f46f064a683a Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 5 Jun 2013 10:21:06 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=9D=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=8B=9C=20=EC=B6=94=EC=B2=9C=EC=9D=B4=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=B6=94=EC=B2=9C=EC=9D=B8=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=EB=A5=BC=20=EA=B2=80=EC=82=AC=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EB=A5=BC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register_form.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 5afac4f41..32b4e3be2 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -342,7 +342,7 @@ function fregisterform_submit(f) } } - if (typeof(f.mb_recommend) != "undefined") { + if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) { if (f.mb_id.value == f.mb_recommend.value) { alert("본인을 추천할 수 없습니다."); f.mb_recommend.focus(); From 2e6f1dfbbc76bf9850a00049cde97fb8970efb0d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 5 Jun 2013 13:14:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/gcaptcha/gcaptcha.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/gcaptcha/gcaptcha.js b/plugin/gcaptcha/gcaptcha.js index a1657af64..1067a1638 100644 --- a/plugin/gcaptcha/gcaptcha.js +++ b/plugin/gcaptcha/gcaptcha.js @@ -26,7 +26,7 @@ function chk_captcha() $(function() { $("#captcha").click(function(e) { - this.setAttribute("src", g4_url+"/plugin/captcha/run.php?t="+(new Date).getTime()); + this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime()); var keycode = (e.keyCode ? e.keyCode : e.which); // 첫 실행에서는 포커스를 주지 않음 if (typeof(keycode) != "undefined") { From cbd976e577ac80bbaa7cdff29f747d64edc70dbf Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 7 Jun 2013 10:08:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?ckeditor=20=EC=9D=98=20enterMode,=20shiftEn?= =?UTF-8?q?terMode=20=EB=A5=BC=20CKEDITOR.ENTER=5FDIV=20=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20Anchor=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=EA=B0=80=20=EC=9D=B4=EC=96=B4=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=ED=98=84=EC=83=81=EC=9D=84=20=ED=95=B4=EA=B2=B0=20#474?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/ckeditor/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/ckeditor/config.js b/plugin/ckeditor/config.js index a6eb7cb96..0326750a6 100644 --- a/plugin/ckeditor/config.js +++ b/plugin/ckeditor/config.js @@ -106,8 +106,8 @@ CKEDITOR.editorConfig = function( config ) { 'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana'; config.fontSize_defaultLabel = "10pt"; config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;"; - config.enterMode = CKEDITOR.ENTER_BR; - config.shiftEnterMode = CKEDITOR.ENTER_P; + config.enterMode = CKEDITOR.ENTER_DIV; + config.shiftEnterMode = CKEDITOR.ENTER_DIV; config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images"; config.keystrokes=[ // Formatting From ffbc3f18f67366972d5a8a0b1c138fcadd017069 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 7 Jun 2013 12:47:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=B3=B8=EC=9D=B8=ED=99=95=EC=9D=B8?= =?UTF-8?q?=EA=B3=BC=20=EA=B4=80=EB=A0=A8=EB=90=9C=20ajax=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register_form.skin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 32b4e3be2..b5e165fa8 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -357,6 +357,7 @@ function fregisterform_submit(f) } } + /* if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) { var error = ""; $.ajax({ @@ -381,6 +382,7 @@ function fregisterform_submit(f) return false; } } + */