[Svn-src-all:2699] [version-2_12-dev 21598] #1683 制約違反時には処理続行しない

[eccuore]

Subversion committed to /home/svn/open 21598
http://svn.ec-cube.net/open_trac/changeset/21598
┌────────────────────────────┐
│更新者　:  eccuore                                      │
│更新日時:  2012-03-07 15:20:35 +0900 (水, 07  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1683 制約違反時には処理続行しない

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

変更: branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	2012-03-07 02:06:47 UTC (rev 21597)
+++ branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php	2012-03-07 06:20:35 UTC (rev 21598)
@@ -597,22 +597,23 @@
                     }
                 }
             }
+
             if ($match === false) {
                 $str_ext = implode('・', $value[2]);
                 $this->arrErr[$value[1]][$index] = '※ ' . $value[0] . 'で許可されている形式は、' . $str_ext . 'です。<br />';
-            }
             // ▲SC_CheckError::FILE_EXT_CHECK から移植
+            }else{
+                $uniqname = date('mdHi') . '_' . uniqid('').'.';
+                $temp_file = preg_replace("/^.*\./", $uniqname, $_FILES['down_realfilename']['name'][$index]);
 
-            $uniqname = date('mdHi') . '_' . uniqid('').'.';
-            $temp_file = preg_replace("/^.*\./", $uniqname, $_FILES['down_realfilename']['name'][$index]);
-
-            if (move_uploaded_file($_FILES['down_realfilename']['tmp_name'][$index], DOWN_TEMP_REALDIR . $temp_file)) {
-                $arrDownRealFiles[$index] = $temp_file;
-                $objFormParam->setValue('down_realfilename', $arrDownRealFiles);
-                GC_Utils_Ex::gfPrintLog($_FILES['down_realfilename']['name'][$index] .' -> '. realpath(DOWN_TEMP_REALDIR . $temp_file));
-            } else {
-                $objErr->arrErr[$keyname] = '※ ファイルのアップロードに失敗しました。<br />';
-                GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES['down_realfilename']['name'][$index] . ' -> ' . DOWN_TEMP_REALDIR . $temp_file);
+                if (move_uploaded_file($_FILES['down_realfilename']['tmp_name'][$index], DOWN_TEMP_REALDIR . $temp_file)) {
+                    $arrDownRealFiles[$index] = $temp_file;
+                    $objFormParam->setValue('down_realfilename', $arrDownRealFiles);
+                    GC_Utils_Ex::gfPrintLog($_FILES['down_realfilename']['name'][$index] .' -> '. realpath(DOWN_TEMP_REALDIR . $temp_file));
+                } else {
+                    $objErr->arrErr[$keyname] = '※ ファイルのアップロードに失敗しました。<br />';
+                    GC_Utils_Ex::gfPrintLog('File Upload Error!: ' . $_FILES['down_realfilename']['name'][$index] . ' -> ' . DOWN_TEMP_REALDIR . $temp_file);
+                }
             }
         }
     }