Changeset 22058 for branches/version-2_12-multilang/html

Timestamp:

2012/10/22 19:42:42 (14 years ago)

Author:

h_yoshimoto

Message:

#1955 r21998～r22057間のコミットをmerge

Location:

branches/version-2_12-multilang

Files:

• . (modified) (1 prop)
• html/install/index.php (modified) (1 diff)
• html/install/sql/insert_data.sql (modified) (1 diff)
• html/rss/product.php (modified) (1 diff)
• html/rss/products.php (copied) (copied from branches/version-2_12-dev/html/rss/products.php)
• html/upload/save_image/noimage_plugin_list.png (copied) (copied from branches/version-2_12-dev/html/upload/save_image/noimage_plugin_list.png)

branches/version-2_12-multilang/html/install/index.php

@@ -196 +196 @@
             }
         }
+
+        //マスターデータのキャッシュを削除
+        $cache_dir = '../../data/cache/';
+        $res_dir = opendir( $cache_dir );
+        while( $file_name = readdir( $res_dir ) ){
+            //dummy以外は削除
+            if($file_name != 'dummy'){
+                unlink($cache_dir . $file_name);
+            }
+        }
+        closedir( $res_dir );
 
         $objPage = lfDispStep3($objPage);

branches/version-2_12-multilang/html/install/sql/insert_data.sql

@@ -304 +304 @@
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (68, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT product_status_id FROM dtb_product_status WHERE dtb_product_status.product_id = prdcls.product_id and del_flg = 0 ORDER BY dtb_product_status.product_status_id), '','')) as product_statuses', '商品ステータス', 68, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (69, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT name FROM dtb_product_status LEFT JOIN mtb_status ON  dtb_product_status.product_status_id = mtb_status.id  WHERE dtb_product_status.product_id = prdcls.product_id and del_flg = 0 ORDER BY dtb_product_status.product_status_id), '','')) as product_status_names', '商品ステータス名', 69, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (70, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_id FROM dtb_product_categories WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_ids', 'カテゴリID', 70, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (70, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_id FROM dtb_product_categories WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_ids', 'カテゴリID', 70, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (71, 1, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT category_name FROM dtb_product_categories LEFT JOIN dtb_category ON dtb_product_categories.category_id = dtb_category.category_id WHERE dtb_product_categories.product_id = prdcls.product_id ORDER BY dtb_product_categories.rank), '','')) as category_names', 'カテゴリ名', 71, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (72, 2, 'customer_id', '会員ID', 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);

branches/version-2_12-multilang/html/rss/product.php

@@ -29 +29 @@
 // {{{ generate page
 
+// @deprecated 2.12.3 html/rss/products.php が正しい。
+trigger_error('前方互換用ファイルが使用されました。', E_USER_WARNING);
+
 $objPage = new LC_Page_Rss_Products_Ex();
 register_shutdown_function(array($objPage, 'destroy'));