Index: /branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php
===================================================================
--- /branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php	(revision 18820)
+++ /branches/version-2_5-dev/test/class/db/SC_DB_MasterData_Test.php	(revision 19773)
@@ -42,5 +42,5 @@
      */
     function testGetMasterData() {
-        $columns = array("pref_id", "pref_name", "rank");
+        $columns = array("id", "name", "rank");
         $masterData = new SC_DB_MasterData_Ex();
         $actual = $masterData->getMasterData("mtb_pref", $columns);
@@ -63,5 +63,5 @@
     function testUpdateMasterData() {
 
-        $columns = array("pref_id", "pref_name", "rank");
+        $columns = array("id", "name", "rank");
         $masterData = new SC_DB_MasterData_Ex();
 
Index: /branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19769)
+++ /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 19773)
@@ -289,5 +289,5 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (117, 3, 'order_zip01', '郵便番号1', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                              
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (118, 3, 'order_zip02', '郵便番号2', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (119, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (120, 3, 'order_addr01', '住所1', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (121, 3, 'order_addr02', '住所2', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
@@ -307,5 +307,5 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (135, 3, 'deliv_zip01', '郵便番号1', 33, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                              
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (136, 3, 'deliv_zip02', '郵便番号2', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (137, 3, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (138, 3, 'deliv_addr01', '住所1', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (139, 3, 'deliv_addr02', '住所2', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
@@ -343,5 +343,5 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (171, 4, 'order_zip01', '郵便番号1', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                              
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (172, 4, 'order_zip02', '郵便番号2', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (173, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.order_pref)', '都道府県', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (174, 4, 'order_addr01', '住所1', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (175, 4, 'order_addr02', '住所2', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                                 
@@ -361,5 +361,5 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (189, 4, 'deliv_zip01', '郵便番号1', 34, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);                              
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (190, 4, 'deliv_zip02', '郵便番号2', 35, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT pref_name FROM mtb_pref WHERE pref_id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (191, 4, '(SELECT name FROM mtb_pref WHERE id = dtb_order.deliv_pref)', '都道府県', 36, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (192, 4, 'deliv_addr01', '住所1', 37, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (193, 4, 'deliv_addr02', '住所2', 38, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -909,51 +909,51 @@
 INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/search/delete_note.php', '1', 11);
 
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (1, '北海道', 1);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (2, '青森県', 2);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (3, '岩手県', 3);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (4, '宮城県', 4);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (5, '秋田県', 5);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (6, '山形県', 6);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (7, '福島県', 7);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (8, '茨城県', 8);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (9, '栃木県', 9);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (10, '群馬県', 10);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (11, '埼玉県', 11);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (12, '千葉県', 12);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (13, '東京都', 13);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (14, '神奈川県', 14);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (15, '新潟県', 15);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (16, '富山県', 16);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (17, '石川県', 17);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (18, '福井県', 18);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (19, '山梨県', 19);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (20, '長野県', 20);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (21, '岐阜県', 21);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (22, '静岡県', 22);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (23, '愛知県', 23);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (24, '三重県', 24);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (25, '滋賀県', 25);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (26, '京都府', 26);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (27, '大阪府', 27);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (28, '兵庫県', 28);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (29, '奈良県', 29);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (30, '和歌山県', 30);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (31, '鳥取県', 31);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (32, '島根県', 32);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (33, '岡山県', 33);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (34, '広島県', 34);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (35, '山口県', 35);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (36, '徳島県', 36);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (37, '香川県', 37);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (38, '愛媛県', 38);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (39, '高知県', 39);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (40, '福岡県', 40);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (41, '佐賀県', 41);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (42, '長崎県', 42);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (43, '熊本県', 43);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (44, '大分県', 44);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (45, '宮崎県', 45);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (46, '鹿児島県', 46);
-INSERT INTO mtb_pref (pref_id, pref_name, rank) VALUES (47, '沖縄県', 47);
+INSERT INTO mtb_pref (id, name, rank) VALUES (1, '北海道', 1);
+INSERT INTO mtb_pref (id, name, rank) VALUES (2, '青森県', 2);
+INSERT INTO mtb_pref (id, name, rank) VALUES (3, '岩手県', 3);
+INSERT INTO mtb_pref (id, name, rank) VALUES (4, '宮城県', 4);
+INSERT INTO mtb_pref (id, name, rank) VALUES (5, '秋田県', 5);
+INSERT INTO mtb_pref (id, name, rank) VALUES (6, '山形県', 6);
+INSERT INTO mtb_pref (id, name, rank) VALUES (7, '福島県', 7);
+INSERT INTO mtb_pref (id, name, rank) VALUES (8, '茨城県', 8);
+INSERT INTO mtb_pref (id, name, rank) VALUES (9, '栃木県', 9);
+INSERT INTO mtb_pref (id, name, rank) VALUES (10, '群馬県', 10);
+INSERT INTO mtb_pref (id, name, rank) VALUES (11, '埼玉県', 11);
+INSERT INTO mtb_pref (id, name, rank) VALUES (12, '千葉県', 12);
+INSERT INTO mtb_pref (id, name, rank) VALUES (13, '東京都', 13);
+INSERT INTO mtb_pref (id, name, rank) VALUES (14, '神奈川県', 14);
+INSERT INTO mtb_pref (id, name, rank) VALUES (15, '新潟県', 15);
+INSERT INTO mtb_pref (id, name, rank) VALUES (16, '富山県', 16);
+INSERT INTO mtb_pref (id, name, rank) VALUES (17, '石川県', 17);
+INSERT INTO mtb_pref (id, name, rank) VALUES (18, '福井県', 18);
+INSERT INTO mtb_pref (id, name, rank) VALUES (19, '山梨県', 19);
+INSERT INTO mtb_pref (id, name, rank) VALUES (20, '長野県', 20);
+INSERT INTO mtb_pref (id, name, rank) VALUES (21, '岐阜県', 21);
+INSERT INTO mtb_pref (id, name, rank) VALUES (22, '静岡県', 22);
+INSERT INTO mtb_pref (id, name, rank) VALUES (23, '愛知県', 23);
+INSERT INTO mtb_pref (id, name, rank) VALUES (24, '三重県', 24);
+INSERT INTO mtb_pref (id, name, rank) VALUES (25, '滋賀県', 25);
+INSERT INTO mtb_pref (id, name, rank) VALUES (26, '京都府', 26);
+INSERT INTO mtb_pref (id, name, rank) VALUES (27, '大阪府', 27);
+INSERT INTO mtb_pref (id, name, rank) VALUES (28, '兵庫県', 28);
+INSERT INTO mtb_pref (id, name, rank) VALUES (29, '奈良県', 29);
+INSERT INTO mtb_pref (id, name, rank) VALUES (30, '和歌山県', 30);
+INSERT INTO mtb_pref (id, name, rank) VALUES (31, '鳥取県', 31);
+INSERT INTO mtb_pref (id, name, rank) VALUES (32, '島根県', 32);
+INSERT INTO mtb_pref (id, name, rank) VALUES (33, '岡山県', 33);
+INSERT INTO mtb_pref (id, name, rank) VALUES (34, '広島県', 34);
+INSERT INTO mtb_pref (id, name, rank) VALUES (35, '山口県', 35);
+INSERT INTO mtb_pref (id, name, rank) VALUES (36, '徳島県', 36);
+INSERT INTO mtb_pref (id, name, rank) VALUES (37, '香川県', 37);
+INSERT INTO mtb_pref (id, name, rank) VALUES (38, '愛媛県', 38);
+INSERT INTO mtb_pref (id, name, rank) VALUES (39, '高知県', 39);
+INSERT INTO mtb_pref (id, name, rank) VALUES (40, '福岡県', 40);
+INSERT INTO mtb_pref (id, name, rank) VALUES (41, '佐賀県', 41);
+INSERT INTO mtb_pref (id, name, rank) VALUES (42, '長崎県', 42);
+INSERT INTO mtb_pref (id, name, rank) VALUES (43, '熊本県', 43);
+INSERT INTO mtb_pref (id, name, rank) VALUES (44, '大分県', 44);
+INSERT INTO mtb_pref (id, name, rank) VALUES (45, '宮崎県', 45);
+INSERT INTO mtb_pref (id, name, rank) VALUES (46, '鹿児島県', 46);
+INSERT INTO mtb_pref (id, name, rank) VALUES (47, '沖縄県', 47);
 
 INSERT INTO mtb_product_list_max (id, name, rank) VALUES (15, '15件', 0);
Index: /branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 19670)
+++ /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 19773)
@@ -527,7 +527,4 @@
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (539, 'dtb_order_detail', 'quantity', '数量');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (540, 'dtb_order_detail', 'point_rate', 'ポイント付与率');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (541, 'mtb_pref', 'pref_id', '都道府県ID');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (542, 'mtb_pref', 'pref_name', '都道府県名');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (543, 'mtb_pref', 'rank', '表示順位');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (544, 'dtb_member', 'member_id', '管理者ID');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (545, 'dtb_member', 'name', '管理者名称');
Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 19761)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 19773)
@@ -750,11 +750,4 @@
 ) TYPE=InnoDB;
 
-CREATE TABLE mtb_pref (
-    pref_id smallint NOT NULL,
-    pref_name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (pref_id)
-) TYPE=InnoDB;
-
 CREATE TABLE dtb_member (
     member_id int  NOT NULL,
@@ -883,4 +876,10 @@
 ) TYPE=InnoDB;
 
+CREATE TABLE mtb_pref (
+    id smallint NOT NULL,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (pref_id)
+) TYPE=InnoDB;
 
 CREATE TABLE mtb_permission (
Index: /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 19761)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 19773)
@@ -752,11 +752,4 @@
 );
 
-CREATE TABLE mtb_pref (
-    pref_id smallint NOT NULL,
-    pref_name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (pref_id)
-);
-
 CREATE TABLE dtb_member (
     member_id int NOT NULL,
@@ -885,4 +878,11 @@
 );
 
+CREATE TABLE mtb_pref (
+    id text,
+    name text,
+    rank smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (id)
+);
+
 CREATE TABLE mtb_permission (
     id text,
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 19764)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 19773)
@@ -40,6 +40,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrMAILTPLPATH =  $masterData->getMasterData("mtb_mail_tpl_path");
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php	(revision 19752)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_CSV.php	(revision 19773)
@@ -46,6 +46,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                  array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrSex = $masterData->getMasterData("mtb_sex");
         $this->arrDISP = $masterData->getMasterData("mtb_disp");
Index: /branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_View.php	(revision 19768)
+++ /branches/version-2_5-dev/data/class/SC_View.php	(revision 19773)
@@ -75,5 +75,5 @@
                 // 都道府県名を変換
                 $masterData = new SC_DB_MasterData_Ex();
-                $arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+                $arrPref = $masterData->getMasterData('mtb_pref');
                 $arrInfo['arrSiteInfo']['pref'] =
                     isset($arrPref[$arrInfo['arrSiteInfo']['pref']])
Index: /branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 19735)
+++ /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 19773)
@@ -40,5 +40,5 @@
         $this->tpl_dispmode = "real";      // 表示モード
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->width_cell = array(110.3,12,21.7,24.5);
 
Index: /branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php	(revision 19773)
@@ -73,5 +73,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php	(revision 19773)
@@ -48,5 +48,5 @@
         $this->tpl_title = '当サイトについて';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php	(revision 19773)
@@ -64,6 +64,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	(revision 19729)
+++ /branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php	(revision 19773)
@@ -61,6 +61,5 @@
         $this->year = "";
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrReminder = $masterData->getMasterData("mtb_reminder");
Index: /branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php	(revision 19773)
@@ -49,6 +49,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 19773)
@@ -59,6 +59,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrReminder = $masterData->getMasterData("mtb_reminder");
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
@@ -226,6 +225,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrReminder = $masterData->getMasterData("mtb_reminder");
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 19773)
@@ -47,6 +47,5 @@
         $this->tpl_title = "お届け先の追加･変更";
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref= $masterData->getMasterData("mtb_pref",
-                            array("pref_id", "pref_name", "rank"));
+        $this->arrPref= $masterData->getMasterData('mtb_pref');
         $this->httpCacheControl('nocache');
     }
Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 19758)
+++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 19773)
@@ -54,5 +54,5 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrMAILTEMPLATE = $masterData->getMasterData("mtb_mail_template");
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
    }
 
Index: /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php	(revision 19773)
@@ -51,6 +51,5 @@
         $this->tpl_mypageno = 'delivery';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref= $masterData->getMasterData("mtb_pref",
-                            array("pref_id", "pref_name", "rank"));
+        $this->arrPref= $masterData->getMasterData('mtb_pref');
         $this->tpl_column_num = 1;
         $this->httpCacheControl('nocache');
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 19773)
@@ -56,5 +56,5 @@
         $this->tpl_title = 'ログイン';
         $masterData = new SC_DB_MasterData();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrSex = $masterData->getMasterData("mtb_sex");
         $this->arrJob = $masterData->getMasterData("mtb_job");
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 19773)
@@ -56,5 +56,5 @@
         $this->tpl_css = URL_DIR.'css/layout/shopping/index.css';
         $masterData = new SC_DB_MasterData();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->tpl_title = "お届け先の指定";
         $this->httpCacheControl('nocache');
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 19711)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 19773)
@@ -49,5 +49,5 @@
         $this->tpl_title = "ご入力内容のご確認";
         $masterData = new SC_DB_MasterData();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrSex = $masterData->getMasterData("mtb_sex");
         $this->arrMAILMAGATYPE = $masterData->getMasterData("mtb_mail_magazine_type");
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 19682)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 19773)
@@ -73,5 +73,5 @@
         $this->tpl_title = "新しいお届け先の追加";
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
     }
 
Index: /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 19680)
+++ /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 19773)
@@ -82,6 +82,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                                 array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrORDERSTATUS = $masterData->getMasterData("mtb_order_status");
 
Index: /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 19738)
+++ /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 19773)
@@ -52,5 +52,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrJob["不明"] = "不明";
Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 19732)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 19773)
@@ -54,5 +54,5 @@
         $this->tpl_mainno = 'basis';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrProductType = $masterData->getMasterData("mtb_product_type");
         $this->tpl_subtitle = '配送業者設定';
Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php	(revision 19773)
@@ -49,5 +49,5 @@
         $this->tpl_mainno = 'basis';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
         $this->tpl_subtitle = '配送業者設定';
Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	(revision 19773)
@@ -54,5 +54,5 @@
         $this->tpl_mainno = 'basis';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
         $this->tpl_subtitle = '特定商取引法';
Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Seo.php	(revision 19773)
@@ -55,5 +55,5 @@
         $this->tpl_subtitle = 'SEO管理';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
     }
Index: /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 19773)
@@ -49,5 +49,5 @@
         $this->tpl_mainno = 'basis';
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule");
         $this->tpl_subtitle = 'SHOPマスタ';
Index: /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	(revision 19677)
+++ /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	(revision 19773)
@@ -52,6 +52,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref",
-                             array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
 
         $this->arrJob = $masterData->getMasterData("mtb_job");
Index: /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 19682)
+++ /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 19773)
@@ -52,5 +52,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
         $this->arrJob = $masterData->getMasterData("mtb_job");
         $this->arrSex = $masterData->getMasterData("mtb_sex");
Index: /branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 19769)
+++ /branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 19773)
@@ -2134,5 +2134,5 @@
 
         $masterData = new SC_DB_MasterData_Ex();
-        $arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $arrPref = $masterData->getMasterData('mtb_pref');
         // インデックスと値を反転させる。
         $arrREV_PREF = array_flip($arrPref);