[Svn-src-all:1340] [version-2_5-dev 20229] こ、こんどこ、、そ、、、、、、ぐふっ

[miningbrownie]

Subversion committed to /home/svn/open 20229
http://svn.ec-cube.net/open_trac/changeset/20229
┌────────────────────────────┐
│更新者　:  miningbrownie                                │
│更新日時:  2011-02-20 03:41:22 +0900 (日, 20  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
こ、こんどこ、、そ、、、、、、ぐふっ

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php

変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2011-02-19 18:33:29 UTC (rev 20228)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	2011-02-19 18:41:22 UTC (rev 20229)
@@ -107,13 +107,10 @@
                     exit;
                 }else{
                     $this->arrErr = $status;
-                    var_dump($status);
-                    echo "\n\n<br/>#######--------- line is ".__LINE__." on ".__FILE__."--------########<br/>\n\n";
-                           
                 }
                 break;
             default:
-                $this->arrForm = $this->createFromValues();
+                $this->arrForm = $this->createFromValues($_GET['order_id'],$_POST['pdf_order_id']);
                 break;
         }
         $this->setTemplate($this->tpl_mainpage);
@@ -123,7 +120,7 @@
      *
      * PDF作成フォームのデフォルト値の生成
      */
-    function createFromValues(){
+    function createFromValues($order_id,$pdf_order_id){
         // ここが$arrFormの初登場ということを明示するため宣言する。
         $arrForm = array();
         // タイトルをセット
@@ -140,12 +137,12 @@
         $arrForm['msg3'] = 'ご確認くださいますよう、お願いいたします。';
 
         // 注文番号があったら、セットする
-        if(SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
-            $arrForm['order_id'][0] = $_GET['order_id'];
-        } elseif (is_array($_POST['pdf_order_id'])) {
+        if(SC_Utils_Ex::sfIsInt($order_id)) {
+            $arrForm['order_id'][0] = $order_id;
+        } elseif (is_array($pdf_order_id)) {
             $this->getOrderIdFromPost($objFormParam);
-            sort($_POST['pdf_order_id']);
-            foreach ($_POST['pdf_order_id'] AS $key=>$val) {
+            sort($pdf_order_id);
+            foreach ($pdf_order_id AS $key=>$val) {
                 $arrForm['order_id'][] = $val;
             }
         }