Index: trunk/kernel/units/selectors/selectors_tag_processor.php =================================================================== diff -u -N -r1566 -r3105 --- trunk/kernel/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 1566) +++ trunk/kernel/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 3105) @@ -67,7 +67,7 @@ $block_params['field'] = $params['field']; $block_params['pass_params'] = 'true'; - $selected_param_name = $params['selected_param']; + $selected_param_name = getArrayValue($params, 'selected_param'); if (!$selected_param_name) $selected_param_name = $params['selected']; $selected = $params['selected']; Index: trunk/core/units/selectors/selectors_tag_processor.php =================================================================== diff -u -N -r1566 -r3105 --- trunk/core/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 1566) +++ trunk/core/units/selectors/selectors_tag_processor.php (.../selectors_tag_processor.php) (revision 3105) @@ -67,7 +67,7 @@ $block_params['field'] = $params['field']; $block_params['pass_params'] = 'true'; - $selected_param_name = $params['selected_param']; + $selected_param_name = getArrayValue($params, 'selected_param'); if (!$selected_param_name) $selected_param_name = $params['selected']; $selected = $params['selected']; Index: trunk/kernel/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r2800 -r3105 --- trunk/kernel/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 2800) +++ trunk/kernel/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 3105) @@ -253,8 +253,7 @@ $parent_info = $object->getLinkedInfo(); $title_field = $this->Application->getUnitOption($event->Prefix,'TitleField'); $sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field; - $object->Fields['ParentId']['options'] = array_merge_recursive2($object->Fields['ParentId']['options'], - $this->Conn->GetCol($sql,$object->IDField) ); + $object->Fields['ParentId']['options'] = $this->Conn->GetCol($sql,$object->IDField); } /** Index: trunk/kernel/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -N -r3038 -r3105 --- trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 3038) +++ trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 3105) @@ -93,7 +93,7 @@ - + " id="" value=""> Index: trunk/core/units/selectors/selectors_config.php =================================================================== diff -u -N -r2799 -r3105 --- trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 2799) +++ trunk/core/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3105) @@ -95,7 +95,7 @@ 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'), + 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => '1','default' => '0'), ), 'VirtualFields' => Array( Index: trunk/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r2800 -r3105 --- trunk/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 2800) +++ trunk/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 3105) @@ -253,8 +253,7 @@ $parent_info = $object->getLinkedInfo(); $title_field = $this->Application->getUnitOption($event->Prefix,'TitleField'); $sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field; - $object->Fields['ParentId']['options'] = array_merge_recursive2($object->Fields['ParentId']['options'], - $this->Conn->GetCol($sql,$object->IDField) ); + $object->Fields['ParentId']['options'] = $this->Conn->GetCol($sql,$object->IDField); } /** Index: trunk/kernel/units/selectors/selectors_config.php =================================================================== diff -u -N -r2799 -r3105 --- trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 2799) +++ trunk/kernel/units/selectors/selectors_config.php (.../selectors_config.php) (revision 3105) @@ -95,7 +95,7 @@ 'Description' => Array('type' => 'string','not_null' => '1','default' => ''), 'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_BaseSelectors', 2 => 'la_BlockSelectors'), 'use_phrases' => 1, 'not_null' => '1','default' => '0'), 'AdvancedCSS' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0=>''), 'not_null' => '1','default' => '0'), + 'ParentId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'required' => 1, 'not_null' => '1','default' => '0'), ), 'VirtualFields' => Array(