Index: branches/5.2.x/units/order_items/order_items_config.php =================================================================== diff -u -N -r14717 -r15719 --- branches/5.2.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 14717) +++ branches/5.2.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 15719) @@ -1,6 +1,6 @@ Array ('type' => 'double', 'default' => NULL), 'ShippingTypeId' => Array ('type' => 'string', 'default' => NULL), 'ItemData' => Array('type' => 'string','default' => null), - 'OptionsSalt' => Array('type' => 'int', 'default' => 0), + 'OptionsSalt' => Array('type' => 'string', 'default' => 0), 'SplitShippingGroup' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'PackageNum' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), 'ReturnType' => Array ( Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php =================================================================== diff -u -N -r15134 -r15719 --- branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 15134) +++ branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 15719) @@ -1,6 +1,6 @@ Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'Combination' => Array ('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format' =>"%s: %s
", 'default' => NULL), - 'CombinationCRC' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), + 'CombinationCRC' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0, ), 'PriceType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), 'Price' => Array ('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ), 'WeightType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ),