Changeset 22093 for branches/version-2_12-dev/data
- Timestamp:
- 2012/11/11 03:11:04 (14 years ago)
- Location:
- branches/version-2_12-dev/data/class/pages
- Files:
-
- 5 edited
-
admin/ownersstore/LC_Page_Admin_OwnersStore.php (modified) (2 diffs)
-
admin/products/LC_Page_Admin_Products_UploadCSV.php (modified) (1 diff)
-
admin/total/LC_Page_Admin_Total.php (modified) (1 diff)
-
frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (modified) (1 diff)
-
shopping/LC_Page_Shopping_Multiple.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
r22038 r22093 338 338 // 一時展開ディレクトリにファイルがある場合は事前に削除. 339 339 $arrFileHash = SC_Helper_FileManager_Ex::sfGetFileList(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR); 340 if (count($arrFileHash) > 0) {340 if (count($arrFileHash) > 0) { 341 341 SC_Helper_FileManager_Ex::deleteFile(DOWNLOADS_TEMP_PLUGIN_INSTALL_DIR, false); 342 342 } 343 343 344 344 //シンタックスエラーがあるtar.gzをアップ後、削除するとたまにディレクトリが消えるので追加 345 345 $this->makeDir(PLUGIN_UPLOAD_REALDIR); … … 858 858 // 解凍元のファイルを削除する. 859 859 unlink($path); 860 860 861 861 return $result; 862 862 } -
branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
r22044 r22093 593 593 if (strlen($sqlval['stock']) === 0){ 594 594 //更新の場合は、sqlvalのキーにstockがある場合のみ対象 595 if (!$upload_flg or ($upload_flg and array_key_exists('stock', $sqlval))) {595 if (!$upload_flg or ($upload_flg and array_key_exists('stock', $sqlval))) { 596 596 $sqlval['stock_unlimited'] = UNLIMITED_FLG_UNLIMITED; 597 597 } -
branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
r22010 r22093 297 297 } 298 298 // 月度集計の場合に、集計期間が本日日付で上書きされてしまうのを回避するため 299 if (($objFormParam->getValue('form') == 1) && ($out_flg == 1 )) {299 if (($objFormParam->getValue('form') == 1) && ($out_flg == 1)) { 300 300 break; 301 301 } -
branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
r22092 r22093 156 156 $this->root_parent_id[] = $arrParentID[0]; 157 157 $arrDispID = array_merge($arrBrothersID, $arrChildrenID); 158 foreach ($arrRet as &$arrCategory) {158 foreach ($arrRet as &$arrCategory) { 159 159 if (in_array($arrCategory['category_id'], $arrDispID)) { 160 160 $arrCategory['display'] = 1; -
branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
r22086 r22093 338 338 //不必要な配送先を削除 339 339 foreach ($_SESSION['shipping'] as $id=>$arrShipping) { 340 if (!isset($arrShipping['shipment_item'])){340 if (!isset($arrShipping['shipment_item'])){ 341 341 $objPurchase->unsetOneShippingTemp($id); 342 342 }
Note: See TracChangeset
for help on using the changeset viewer.
