Changeset 20535

Timestamp:

2011/03/07 13:26:12 (15 years ago)

Author:

kimoto

Message:

コンフリクト解消

File:

• branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php

@@ -56 +56 @@
         $this->arrSTATUS = $masterData->getMasterData("mtb_status");
         $this->arrPRODUCTSTATUS_COLOR = $masterData->getMasterData("mtb_product_status_color");
-    }
-
-    /**
-     * Page のプロセス.
-     *
-     * @return void
-     */
-    function process() {
-        $this->action();
-        $this->sendResponse();
-    }
-
-    /**
-     * Page のアクション.
-     *
-     * @return void
-     */
-    function action() {
-        $objDb = new SC_Helper_DB_Ex();
-        $objDate = new SC_Date_Ex();
-        $objFormParam = new SC_FormParam_Ex();
-        $objProduct = new SC_Product_Ex();
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-
+
+        $objDate = new SC_Date();
         // 登録・更新検索開始年
         $objDate->setStartYear(RELEASE_YEAR);
@@ -92 +70 @@
         $this->arrEndMonth = $objDate->getMonth();
         $this->arrEndDay = $objDate->getDay();
+
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        $this->action();
+        $this->sendResponse();
+    }
+
+    /**
+     * Page のアクション.
+     *
+     * @return void
+     */
+    function action() {
+        $objDb = new SC_Helper_DB_Ex();
+        $objFormParam = new SC_FormParam();
+        $objProduct = new SC_Product();
+        $objQuery =& SC_Query::getSingletonInstance();
 
         // パラメータ情報の初期化