Index: branches/dev/html/install/index.php
===================================================================
--- branches/dev/html/install/index.php	(revision 12125)
+++ branches/dev/html/install/index.php	(revision 12134)
@@ -958,51 +958,51 @@
 	// CSV¥Æ¡¼¥Ö¥ë
 	if(sfTabaleExists('dtb_csv', $dsn)) {
-		lfInsertCSVData(1,'category_id','¥«¥Æ¥´¥êID',53,'now()','now()');		
-		lfInsertCSVData(4,'order_id','ÃíÊ¸ID',1,'now()','now()');
-		lfInsertCSVData(4,'campaign_id','¥­¥ã¥ó¥Ú¡¼¥óID',2,'now()','now()');
-		lfInsertCSVData(4,'customer_id','¸ÜµÒID',3,'now()','now()');
-		lfInsertCSVData(4,'message','Í×Ë¾Åù',4,'now()','now()');
-		lfInsertCSVData(4,'order_name01','¸ÜµÒÌ¾1',5,'now()','now()');
-		lfInsertCSVData(4,'order_name02','¸ÜµÒÌ¾2',6,'now()','now()');
-		lfInsertCSVData(4,'order_kana01','¸ÜµÒÌ¾¥«¥Ê1',7,'now()','now()');
-		lfInsertCSVData(4,'order_kana02','¸ÜµÒÌ¾¥«¥Ê2',8,'now()','now()');
-		lfInsertCSVData(4,'order_email','¥á¡¼¥ë¥¢¥É¥ì¥¹',9,'now()','now()');
-		lfInsertCSVData(4,'order_tel01','ÅÅÏÃÈÖ¹æ1',10,'now()','now()');
-		lfInsertCSVData(4,'order_tel02','ÅÅÏÃÈÖ¹æ2',11,'now()','now()');
-		lfInsertCSVData(4,'order_tel03','ÅÅÏÃÈÖ¹æ3',12,'now()','now()');
-		lfInsertCSVData(4,'order_fax01','FAX1',13,'now()','now()');
-		lfInsertCSVData(4,'order_fax02','FAX2',14,'now()','now()');
-		lfInsertCSVData(4,'order_fax03','FAX3',15,'now()','now()');
-		lfInsertCSVData(4,'order_zip01','Í¹ÊØÈÖ¹æ1',16,'now()','now()');
-		lfInsertCSVData(4,'order_zip02','Í¹ÊØÈÖ¹æ2',17,'now()','now()');
-		lfInsertCSVData(4,'order_pref','ÅÔÆ»ÉÜ¸©',18,'now()','now()');
-		lfInsertCSVData(4,'order_addr01','½»½ê1',19,'now()','now()');
-		lfInsertCSVData(4,'order_addr02','½»½ê2',20,'now()','now()');
-		lfInsertCSVData(4,'order_sex','À­ÊÌ',21,'now()','now()');
-		lfInsertCSVData(4,'order_birth','À¸Ç¯·îÆü',22,'now()','now()');
-		lfInsertCSVData(4,'order_job','¿¦¼ï',23,'now()','now()');
-		lfInsertCSVData(4,'deliv_name01','ÇÛÁ÷ÀèÌ¾Á°',24,'now()','now()');
-		lfInsertCSVData(4,'deliv_name02','ÇÛÁ÷ÀèÌ¾Á°',25,'now()','now()');
-		lfInsertCSVData(4,'deliv_kana01','ÇÛÁ÷Àè¥«¥Ê',26,'now()','now()');
-		lfInsertCSVData(4,'deliv_kana02','ÇÛÁ÷Àè¥«¥Ê',27,'now()','now()');
-		lfInsertCSVData(4,'deliv_tel01','ÅÅÏÃÈÖ¹æ1',28,'now()','now()');
-		lfInsertCSVData(4,'deliv_tel02','ÅÅÏÃÈÖ¹æ2',29,'now()','now()');
-		lfInsertCSVData(4,'deliv_tel03','ÅÅÏÃÈÖ¹æ3',30,'now()','now()');
-		lfInsertCSVData(4,'deliv_fax01','FAX1',31,'now()','now()');
-		lfInsertCSVData(4,'deliv_fax02','FAX2',32,'now()','now()');
-		lfInsertCSVData(4,'deliv_fax03','FAX3',33,'now()','now()');
-		lfInsertCSVData(4,'deliv_zip01','Í¹ÊØÈÖ¹æ1',34,'now()','now()');
-		lfInsertCSVData(4,'deliv_zip02','Í¹ÊØÈÖ¹æ2',35,'now()','now()');
-		lfInsertCSVData(4,'deliv_pref','ÅÔÆ»ÉÜ¸©',36,'now()','now()');
-		lfInsertCSVData(4,'deliv_addr01','½»½ê1',37,'now()','now()');
-		lfInsertCSVData(4,'deliv_addr02','½»½ê2',38,'now()','now()');
-		lfInsertCSVData(4,'payment_total','¤ª»ÙÊ§¤¤¹ç·×',39,'now()','now()');
+		lfInsertCSVData(1,'category_id','¥«¥Æ¥´¥êID',53,'now()','now()', $dsn);		
+		lfInsertCSVData(4,'order_id','ÃíÊ¸ID',1,'now()','now()', $dsn);
+		lfInsertCSVData(4,'campaign_id','¥­¥ã¥ó¥Ú¡¼¥óID',2,'now()','now()', $dsn);
+		lfInsertCSVData(4,'customer_id','¸ÜµÒID',3,'now()','now()', $dsn);
+		lfInsertCSVData(4,'message','Í×Ë¾Åù',4,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_name01','¸ÜµÒÌ¾1',5,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_name02','¸ÜµÒÌ¾2',6,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_kana01','¸ÜµÒÌ¾¥«¥Ê1',7,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_kana02','¸ÜµÒÌ¾¥«¥Ê2',8,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_email','¥á¡¼¥ë¥¢¥É¥ì¥¹',9,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_tel01','ÅÅÏÃÈÖ¹æ1',10,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_tel02','ÅÅÏÃÈÖ¹æ2',11,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_tel03','ÅÅÏÃÈÖ¹æ3',12,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_fax01','FAX1',13,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_fax02','FAX2',14,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_fax03','FAX3',15,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_zip01','Í¹ÊØÈÖ¹æ1',16,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_zip02','Í¹ÊØÈÖ¹æ2',17,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_pref','ÅÔÆ»ÉÜ¸©',18,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_addr01','½»½ê1',19,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_addr02','½»½ê2',20,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_sex','À­ÊÌ',21,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_birth','À¸Ç¯·îÆü',22,'now()','now()', $dsn);
+		lfInsertCSVData(4,'order_job','¿¦¼ï',23,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_name01','ÇÛÁ÷ÀèÌ¾Á°',24,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_name02','ÇÛÁ÷ÀèÌ¾Á°',25,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_kana01','ÇÛÁ÷Àè¥«¥Ê',26,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_kana02','ÇÛÁ÷Àè¥«¥Ê',27,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_tel01','ÅÅÏÃÈÖ¹æ1',28,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_tel02','ÅÅÏÃÈÖ¹æ2',29,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_tel03','ÅÅÏÃÈÖ¹æ3',30,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_fax01','FAX1',31,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_fax02','FAX2',32,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_fax03','FAX3',33,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_zip01','Í¹ÊØÈÖ¹æ1',34,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_zip02','Í¹ÊØÈÖ¹æ2',35,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_pref','ÅÔÆ»ÉÜ¸©',36,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_addr01','½»½ê1',37,'now()','now()', $dsn);
+		lfInsertCSVData(4,'deliv_addr02','½»½ê2',38,'now()','now()', $dsn);
+		lfInsertCSVData(4,'payment_total','¤ª»ÙÊ§¤¤¹ç·×',39,'now()','now()', $dsn);
 	}
 }
 
 // CSV¥Æ¡¼¥Ö¥ë¤Ø¤Î¥Ç¡¼¥¿¤ÎÄÉ²Ã
-function lfInsertCSVData($csv_id,$col,$disp_name,$rank,$create_date,$update_date) {
+function lfInsertCSVData($csv_id,$col,$disp_name,$rank,$create_date,$update_date, $dsn) {
 	$sql = "insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date) values($csv_id,'$col','$disp_name',$rank,$create_date,$update_date);";
-	sfDataExists("dtb_csv", "csv_id = ? AND col = ?", array($csv_id, $col), $dsn = "", $sql, true);
+	sfDataExists("dtb_csv", "csv_id = ? AND col = ?", array($csv_id, $col), $dsn, $sql, true);
 }
 ?>
