← All changes | classes/models/fields/FrmFieldRadio.php +4 -35 6.32 → 6.8 View file →

		@@ -9,9 +9,8 @@
9	9	class FrmFieldRadio extends FrmFieldType {
10	10
11	11	/**
12	12	* @var string
13		- *
14	13	* @since 3.0
15	14	*/
16	15	protected $type = 'radio';
17	16
		@@ -16,9 +15,8 @@
16	15	protected $type = 'radio';
17	16
18	17	/**
19	18	* @var bool
20		- *
21	19	* @since 3.0
22	20	*/
23	21	protected $holds_email_values = true;
24	22
		@@ -25,9 +23,8 @@
25	23	/**
26	24	* Does the html for this field label need to include "for"?
27	25	*
28	26	* @var bool
29		- *
30	27	* @since 3.06.01
31	28	*/
32	29	protected $has_for_label = false;
33	30
		@@ -33,13 +30,10 @@
33	30
34	31	/**
35	32	* @var bool
36	33	*/
37		- protected $array_allowed = true;
	34	+ protected $array_allowed = false;
38	35
39		- /**
40		- * @return string
41		- */
42	36	protected function input_html() {
43	37	return $this->multiple_input_html();
44	38	}
45	39
		@@ -47,23 +41,11 @@
47	41	return $this->include_front_form_file();
48	42	}
49	43
50	44	/**
51		- * @return bool[]
52		- */
53		- protected function field_settings_for_type() {
54		- return array(
55		- 'invalid' => true,
56		- );
57		- }
58		-
59		- /**
60	45	* Get the type of field being displayed.
61	46	*
62	47	* @since 4.02.01
63		- *
64		- * @param array|object $field
65		- *
66	48	* @return array
67	49	*/
68	50	public function displayed_field_type( $field ) {
69	51	return array(
		@@ -74,10 +56,12 @@
74	56	/**
75	57	* @return array
76	58	*/
77	59	protected function extra_field_opts() {
	60	+ $form_id = $this->get_field_column( 'form_id' );
	61	+
78	62	return array(
79		- 'align' => '',
	63	+ 'align' => FrmStylesController::get_style_val( 'radio_align', ( empty( $form_id ) ? 'default' : $form_id ) ),
80	64	);
81	65	}
82	66
83	67	/**
		@@ -96,10 +80,8 @@
96	80
97	81	/**
98	82	* @since 4.06
99	83	*
100		- * @param array $args
101		- *
102	84	* @return void
103	85	*/
104	86	protected function show_priority_field_choices( $args = array() ) {
105	87	include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/radio-images.php';
		@@ -116,19 +98,6 @@
116	98	* @return bool
117	99	*/
118	100	protected function show_readonly_hidden() {
119	101	return true;
120		- }
121		-
122		- /**
123		- * Unset aria-invalid for radio buttons because it's not valid for radio buttons.
124		- * Instead aria-invalid is added to the radiogroup parent element.
125		- *
126		- * @since 6.25
127		- *
128		- * @param array $shortcode_atts
129		- * @param array $args
130		- */
131		- public function set_aria_invalid_error( &$shortcode_atts, $args ) {
132		- unset( $shortcode_atts['aria-invalid'] );
133	102	}
134	103	}