Index: branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_table.sql	(revision 20381)
+++ branches/version-2_5-dev/html/install/sql/drop_table.sql	(revision 20411)
@@ -57,5 +57,4 @@
 DROP TABLE mtb_product_list_max;
 DROP TABLE mtb_permission;
-DROP TABLE mtb_page_rows;
 DROP TABLE mtb_page_max;
 DROP TABLE mtb_order_status_color;
Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 20408)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 20411)
@@ -832,15 +832,4 @@
 INSERT INTO mtb_page_max (id, name, rank) VALUES (90, '90', 8);
 INSERT INTO mtb_page_max (id, name, rank) VALUES (100, '100', 9);
-
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (10, '10', 0);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (20, '20', 1);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (30, '30', 2);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (40, '40', 3);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (50, '50', 4);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (60, '60', 5);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (70, '70', 6);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (80, '80', 7);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (90, '90', 8);
-INSERT INTO mtb_page_rows (id, name, rank) VALUES (100, '100', 9);
 
 INSERT INTO mtb_permission (id, name, rank) VALUES ('/admin/system/index.php', '0', 0);
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 20381)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 20411)
@@ -984,11 +984,4 @@
 ) ENGINE=InnoDB;
 
-CREATE TABLE mtb_page_rows (
-    id smallint,
-    name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (id)
-) ENGINE=InnoDB;
-
 CREATE TABLE mtb_mail_type (
     id smallint,
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 20381)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 20411)
@@ -984,11 +984,4 @@
 );
 
-CREATE TABLE mtb_page_rows (
-    id smallint,
-    name text,
-    rank smallint NOT NULL DEFAULT 0,
-    PRIMARY KEY (id)
-);
-
 CREATE TABLE mtb_mail_type (
     id smallint,
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 20387)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 20411)
@@ -494,5 +494,5 @@
         $objFormParam->addParam('登録・更新日(終了月)', 'search_end_month', 2, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
         $objFormParam->addParam('登録・更新日(終了日)', 'search_end_day', 2, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
-        $objFormParam->addParam('表示件数', 'search_page_rows', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
+        $objFormParam->addParam('表示件数', 'search_page_max', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
         $objFormParam->addParam('ページ番号', 'search_pageno', INT_LEN, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"), 1, false);
         $objFormParam->addParam('最終購入日(開始年)', 'search_buy_start_year', 4, 'n', array("NUM_CHECK","MAX_LENGTH_CHECK"));
@@ -561,5 +561,5 @@
         $objQuery =& SC_Query::getSingletonInstance();
         $objSelect = new SC_CustomerList($arrParam, "customer");
-        $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_rows']);
+        $page_max = SC_Utils_Ex::sfGetSearchPageMax($arrParam['search_page_max']);
         $disp_pageno = $arrParam['search_pageno'];
         if($disp_pageno == 0) {
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 20384)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	(revision 20411)
@@ -56,5 +56,5 @@
         $this->arrJob["不明"] = "不明";
         $this->arrSex = $masterData->getMasterData("mtb_sex");
-        $this->arrPageRows = $masterData->getMasterData("mtb_page_rows");
+        $this->arrPageRows = $masterData->getMasterData("mtb_page_max");
         $this->arrStatus = $masterData->getMasterData("mtb_customer_status");
         $this->arrMagazineType = $masterData->getMasterData("mtb_magazine_type");
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 20385)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 20411)
@@ -56,5 +56,5 @@
         $this->arrJob["不明"] = "不明";
         $this->arrSex = $masterData->getMasterData("mtb_sex");
-        $this->arrPageRows = $masterData->getMasterData("mtb_page_rows");
+        $this->arrPageRows = $masterData->getMasterData("mtb_page_max");
         $this->arrHtmlmail = array( "" => "両方",  1 => "HTML", 2 => "TEXT" );
         $this->arrMailType = $masterData->getMasterData("mtb_mail_type");
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 20407)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 20411)
@@ -51,5 +51,5 @@
   <div class="btn">
     <p class="page_rows">検索結果表示件数
-    <!--{assign var=key value="search_page_rows"}-->
+    <!--{assign var=key value="search_page_max"}-->
     <select name="<!--{$key}-->">
       <!--{html_options options=$arrPageRows selected=$arrForm[$key]}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 20407)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 20411)
@@ -72,6 +72,6 @@
   <div class="btn">
     <p class="page_rows">検索結果表示件数
-    <select name="search_page_rows">
-      <!--{html_options options=$arrPageRows selected=$arrForm.search_page_rows}-->
+    <select name="search_page_max">
+      <!--{html_options options=$arrPageRows selected=$arrForm.search_page_max}-->
     </select> 件</p>
     <div class="btn-area">