From 2e9032a4ee0d749be05a7de05c9734c24f1ec636 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 19 Feb 2008 15:14:57 +0000
Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=9A=B4=ED=84=B0=EC=99=80=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BB=A8=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=EB=A5=BC=20=EC=9E=AC=EC=B6=9C=EB=A0=A5=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
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@3717 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/counter/counter.addon.php | 2 +-
 modules/file/file.controller.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php
index fc2bed4ae..6e7f2c75a 100644
--- a/addons/counter/counter.addon.php
+++ b/addons/counter/counter.addon.php
@@ -13,7 +13,7 @@
      **/
 
     // called_position가 before_module_init 이고 module이 admin이 아닐 경우
-    if($called_position == 'before_module_init' && !$GLOBALS['__counter_addon_called__']) {
+    if($called_position == 'before_module_init' && !$GLOBALS['__counter_addon_called__'] && !in_array(Context::get('act'), array('procCounterExecute','procFileDelete'))) {
         if($this->module != 'admin') Context::addJsFile('./modules/counter/tpl/js/counter.js');
         $GLOBALS['__counter_addon_called__'] = true;
     }
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 98bbd92ad..64705c89e 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -198,9 +198,7 @@
             if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 
             $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-            if(!$upload_target_srl) return;
-
-            if($file_srl) $output = $this->deleteFile($file_srl);
+            if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
 
             // 첨부파일의 목록을 java script로 출력
             $this->printUploadedFileList($editor_sequence, $upload_target_srl);
@@ -531,6 +529,7 @@
             Context::set('upload_status', $upload_status);
 
             // 업로드 현황을 브라우저로 알리기 위한 javascript 코드 출력하는 템플릿 호출
+            Context::set('layout','none');
             $this->setTemplatePath($this->module_path.'tpl');
             $this->setTemplateFile('print_uploaded_file_list');
         }