From db0d007bddd4fd9e703f3cd4113f96e38223ae0a Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Thu, 24 Jan 2013 17:52:58 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/ckeditor/upload.php | 9 +++------
 extend/g4s.extend.php   | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bbs/ckeditor/upload.php b/bbs/ckeditor/upload.php
index c209a5eeb..1029bdd32 100644
--- a/bbs/ckeditor/upload.php
+++ b/bbs/ckeditor/upload.php
@@ -1,15 +1,12 @@
 <?php
+define('G4_EDITOR', 1);
 $g4_path = "../.."; // common.php 의 상대 경로
 include_once("$g4_path/common.php");
 
-$up_dir = $g4['path'].'/'.$ckeditor->data;; // 기본 업로드 폴더
-@mkdir($up_dir, 0707);
-@chmod($up_dir, 0707);
-
 $ym = date('ym', $g4['server_time']);
 
-$data_dir = $g4['path'].'/'.$ckeditor->data.'/'.$ym;
-$data_url = $g4['url'] .'/'.$ckeditor->data.'/'.$ym;
+$data_dir = $g4['ckeditor_data_path'].'/'.$ym;
+$data_url = $g4['ckeditor_data_url'].'/'.$ym;
 @mkdir($data_dir, 0707);
 @chmod($data_dir, 0707);
  
diff --git a/extend/g4s.extend.php b/extend/g4s.extend.php
index ac2bf0598..0e27b9fbb 100644
--- a/extend/g4s.extend.php
+++ b/extend/g4s.extend.php
@@ -39,7 +39,8 @@ if (G4_EDITOR) {
     $g4['ckeditor_dir']  = 'ckeditor';
     $g4['ckeditor_url']  = $g4['bbs_url'].'/'.$g4['ckeditor_dir'];
     $g4['ckeditor_path'] = $g4['bbs_path'].'/'.$g4['ckeditor_dir'];
-    $g4['ckeditor_data'] = $g4['bbs_path'].'/'.$g4['data_dir'].'/editor';
+    $g4['ckeditor_data_path'] = $g4['data_path'].'/editor';
+    $g4['ckeditor_data_url']  = $g4['data_url'].'/editor';
 
     include_once($g4['ckeditor_path']."/ckeditor.lib.php");