Changeset 21684 for branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
- Timestamp:
- 2012/03/26 21:44:52 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
r21667 r21684 703 703 $to_h = $objUpFile->height[$arrImageKey[$to_key]]; 704 704 705 if($forced) $objUpFile->save_file[$arrImageKey[$to_key]] = ''; 706 707 if(empty($objUpFile->temp_file[$arrImageKey[$to_key]]) 708 && empty($objUpFile->save_file[$arrImageKey[$to_key]])) { 705 if ($forced) { 706 $objUpFile->save_file[$arrImageKey[$to_key]] = ''; 707 } 708 709 if (empty($objUpFile->temp_file[$arrImageKey[$to_key]]) 710 && empty($objUpFile->save_file[$arrImageKey[$to_key]]) 711 ) { 709 712 // リネームする際は、自動生成される画像名に一意となるように、Suffixを付ける 710 713 $dst_file = $objUpFile->lfGetTmpImageName(IMAGE_RENAME, '', $objUpFile->temp_file[$arrImageKey[$from_key]]) . $this->lfGetAddSuffix($to_key); … … 729 732 730 733 foreach ($arrKeyName as $key => $keyname) { 731 if ($keyname != $image_key) continue;734 if ($keyname != $image_key) continue; 732 735 733 736 if (!empty($arrTempFile[$key])) { … … 767 770 $objImage->moveTempImage($temp_file, $objUpFile->save_dir); 768 771 $arrImageKey[] = $arrKeyName[$key]; 769 if(!empty($arrSaveFile[$key]) 770 && !$this->lfHasSameProductImage($product_id, $arrImageKey, $arrSaveFile[$key]) 771 && !in_array($temp_file, $arrSaveFile)) { 772 if (!empty($arrSaveFile[$key]) 773 && !$this->lfHasSameProductImage($product_id, $arrImageKey, $arrSaveFile[$key]) 774 && !in_array($temp_file, $arrSaveFile) 775 ) { 772 776 $objImage->deleteImage($arrSaveFile[$key], $objUpFile->save_dir); 773 777 } … … 1265 1269 */ 1266 1270 function lfGetAddSuffix($to_key) { 1267 if ( IMAGE_RENAME === true) return;1271 if ( IMAGE_RENAME === true) return; 1268 1272 1269 1273 // 自動生成される画像名 … … 1295 1299 1296 1300 for ($i = 1; $i <= PRODUCTSUB_MAX; $i++) { 1297 if(SC_Utils_Ex::isBlank($arrSubProductData['sub_title'.$i]) == false 1298 || SC_Utils_Ex::isBlank($arrSubProductData['sub_comment'.$i]) == false 1299 || SC_Utils_Ex::isBlank($arrSubProductData['sub_image'.$i]) == false 1300 || SC_Utils_Ex::isBlank($arrSubProductData['sub_large_image'.$i]) == false 1301 || SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_image'.$i]) == false 1302 || SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_large_image'.$i]) == false) { 1301 if (SC_Utils_Ex::isBlank($arrSubProductData['sub_title'.$i]) == false 1302 || SC_Utils_Ex::isBlank($arrSubProductData['sub_comment'.$i]) == false 1303 || SC_Utils_Ex::isBlank($arrSubProductData['sub_image'.$i]) == false 1304 || SC_Utils_Ex::isBlank($arrSubProductData['sub_large_image'.$i]) == false 1305 || SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_image'.$i]) == false 1306 || SC_Utils_Ex::isBlank($arrSubProductData['temp_sub_large_image'.$i]) == false 1307 ) { 1303 1308 $has_subproduct_data = true; 1304 1309 break;
Note: See TracChangeset
for help on using the changeset viewer.