From 4beeb3828f91dd819ece14f1d67e21d9ef925eab Mon Sep 17 00:00:00 2001
From: misol <misol.kr@gmail.com>
Date: Tue, 16 Jun 2009 12:47:49 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B8=80=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6565 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/editor.controller.php | 13 +++++++++----
 modules/editor/editor.model.php      |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index f013d7208..a87df5913 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -295,10 +295,15 @@
                 $args->ipaddress = $_SERVER['REMOTE_ADDR'];
             }
 
-            if($mode) {
-                $output = executeQuery('editor.getSavedDocument', $args);
-                $trigger_obj = $output->data;
-                $output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $trigger_obj);
+            // 자동저장된 값이 혹시 이미 등록된 글인지 확인
+            $oDocumentModel = &getModel('document');
+            $oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
+            if(!$oSaved->isExists()) {
+                if($mode) {
+                    $output = executeQuery('editor.getSavedDocument', $args);
+                    $trigger_obj = $output->data;
+                    $output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $trigger_obj);
+                }
             }
 
             // 일단 이전 저장본 삭제
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index c65031c88..318559082 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -106,7 +106,7 @@
              **/
             if($enable_autosave) {
                 // 자동 저장된 데이터를 추출
-                $saved_doc = $this->getSavedDoc($upload_target_srl);
+                if(!Context::get($option->primary_key_name)) $saved_doc = $this->getSavedDoc($upload_target_srl);
 
                 // 자동 저장 데이터를 context setting
                 Context::set('saved_doc', $saved_doc);