Index: branches/RC/core/install/install_schema.sql =================================================================== diff -u -N -r10784 -r10856 --- branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 10784) +++ branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 10856) @@ -21,23 +21,25 @@ CREATE TABLE CustomField ( CustomFieldId int(11) NOT NULL auto_increment, - Type int(11) NOT NULL default '0', + `Type` int(11) NOT NULL default '0', FieldName varchar(255) NOT NULL default '', FieldLabel varchar(40) default NULL, - MultiLingual TINYINT UNSIGNED NOT NULL DEFAULT '1', + MultiLingual tinyint(3) unsigned NOT NULL default '1', Heading varchar(60) default NULL, Prompt varchar(60) default NULL, ElementType varchar(50) NOT NULL default '', - ValueList varchar(255) default NULL, + ValueList text, + DefaultValue varchar(255) NOT NULL default '', DisplayOrder int(11) NOT NULL default '0', OnGeneralTab tinyint(4) NOT NULL default '0', IsSystem tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (CustomFieldId), - KEY Type (Type), + KEY `Type` (`Type`), KEY MultiLingual (MultiLingual), KEY DisplayOrder (DisplayOrder), KEY OnGeneralTab (OnGeneralTab), - KEY IsSystem (IsSystem) + KEY IsSystem (IsSystem), + KEY DefaultValue (DefaultValue) ); CREATE TABLE ConfigurationAdmin ( Index: branches/RC/core/install/upgrades.sql =================================================================== diff -u -N -r10715 -r10856 --- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10715) +++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10856) @@ -307,4 +307,9 @@ INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationAdmin VALUES ('AdminSSL_URL', 'la_Text_Website', 'la_config_AdminSSL_URL', 'text', '', '', 10.091, 0, 0); -INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general'); \ No newline at end of file +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general'); + +# ===== v 4.3.2 ===== +ALTER TABLE CustomField + ADD DefaultValue VARCHAR(255) NOT NULL AFTER ValueList, + ADD INDEX (DefaultValue); \ No newline at end of file Index: branches/RC/core/units/custom_fields/custom_fields_config.php =================================================================== diff -u -N -r8929 -r10856 --- branches/RC/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 8929) +++ branches/RC/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 10856) @@ -82,6 +82,7 @@ 'Prompt' => Array('type' => 'string','default' => null), 'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')), 'ValueList' => Array('type' => 'string','default' => null), + 'DefaultValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'OnGeneralTab' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), ), Index: branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl =================================================================== diff -u -N -r9853 -r10856 --- branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl (.../custom_fields_edit.tpl) (revision 9853) +++ branches/RC/core/admin_templates/custom_fields/custom_fields_edit.tpl (.../custom_fields_edit.tpl) (revision 10856) @@ -69,6 +69,7 @@ + Index: branches/RC/core/units/custom_data/custom_data_event_handler.php =================================================================== diff -u -N -r10832 -r10856 --- branches/RC/core/units/custom_data/custom_data_event_handler.php (.../custom_data_event_handler.php) (revision 10832) +++ branches/RC/core/units/custom_data/custom_data_event_handler.php (.../custom_data_event_handler.php) (revision 10856) @@ -110,7 +110,7 @@ foreach ($custom_fields as $custom_id => $custom_params) { $custom_name = $custom_params['FieldName']; - $field_options = Array('type' => 'string', 'not_null' => 1, 'default' => ''); + $field_options = Array('type' => 'string', 'not_null' => 1, 'default' => $custom_params['DefaultValue']); switch ($custom_params['ElementType']) { case 'date':