Index: /temp/branches/ec-cube-beta/html/admin/contents/campaign.php
===================================================================
--- /temp/branches/ec-cube-beta/html/admin/contents/campaign.php	(revision 10832)
+++ /temp/branches/ec-cube-beta/html/admin/contents/campaign.php	(revision 10833)
@@ -49,5 +49,5 @@
 	case 'regist':
 		// ¥¨¥é¡¼¥Á¥§¥Ã¥¯
-		$objPage->arrErr = lfErrorCheck();
+		$objPage->arrErr = lfErrorCheck($campaign_id);
 		
 		if(count($objPage->arrErr) <= 0) {
@@ -141,8 +141,9 @@
 /* 
  * ´Ø¿ô̾¡§lfErrorCheck()
+ * °ú¿ô1 ¡§¥­¥ã¥ó¥Ú¡¼¥óID
  * ÀâÌÀ¡¡¡§¥¨¥é¡¼¥Á¥§¥Ã¥¯
  * Ìá¤êÃÍ¡§¥¨¥é¡¼Ê¸»ú³ÊǼÇÛÎó
  */
-function lfErrorCheck() {
+function lfErrorCheck($campaign_id = 0) {
 	
 	global $objQuery;
@@ -158,11 +159,14 @@
 	
 	if(count($objErr->arrErr) <= 0) {
+
+		$directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id));
+
 		// Ʊ̾¤Î¥Õ¥©¥ë¥À¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¥¨¥é¡¼
-		if(file_exists(USER_INC_PATH.$arrList['directory_name'])) {
+		if(file_exists(CAMPAIGN_PATH.$arrList['directory_name'] && $directory_name != $arrList['directory_name'])) {
 			$objErr->arrErr['directory_name'] = "¢¨ Ʊ̾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£<br/>";
 		}
+		$ret = $objQuery->get("dtb_campaign", "directory_name", "directory_name = ? AND del_flg = ?", array($arrList['directory_name'], 0));				
 		// DB¤Ë¤¹¤Ç¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¥Á¥§¥Ã¥¯
-		$ret = $objQuery->get("dtb_campaign", "campaign_id", "directory_name = ?", array($arrList['directory_name']));
-		if($ret != "") {
+		if($ret != "" && $directory_name != $arrList['directory_name']) {
 			$objErr->arrErr['directory_name'] = "¢¨ ¤¹¤Ç¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê̾¤Ç¤¹¡£<br/>";
 		}		
@@ -219,8 +223,8 @@
 		// insert
 		$objQuery->insert("dtb_campaign", $sqlval);
+		
+		// ¥­¥ã¥ó¥Ú¡¼¥ó¥Ú¡¼¥¸¥Ç¥£¥ì¥¯¥È¥êºîÀ®
+		$ret = lfCreateDir(CAMPAIGN_PATH . $arrList['directory_name']);		
 	}
-	
-	// ¥­¥ã¥ó¥Ú¡¼¥ó¥Ú¡¼¥¸¥Ç¥£¥ì¥¯¥È¥êºîÀ®
-	$ret = lfCreateDir(CAMPAIGN_PATH . $arrList['directory_name']);
 }