← All changes | classes/controllers/FrmFieldsController.php +21 -9 6.4.2 → 5.5.2 View file →

		@@ -752,16 +752,9 @@
752	752	* @param array $field
753	753	* @param array $add_html
754	754	*/
755	755	private static function maybe_add_html_required( $field, array &$add_html ) {
756		- $excluded_field_types =
757		- FrmField::is_radio( $field ) ||
758		- FrmField::is_checkbox( $field ) ||
759		- FrmField::is_field_type( $field, 'file' ) ||
760		- FrmField::is_field_type( $field, 'nps' ) ||
761		- FrmField::is_field_type( $field, 'scale' );
762		-
763		- if ( $excluded_field_types ) {
	756	+ if ( in_array( $field['type'], array( 'file', 'data', 'lookup' ), true ) ) {
764	757	return;
765	758	}
766	759
767	760	$include_html = FrmAppHelper::meets_min_pro_version( '3.06.01' );
		@@ -885,9 +878,12 @@
885	878	*
886	879	* @deprecated 4.0 Moved to Pro for Other option only.
887	880	*/
888	881	public static function add_option() {
889		- _deprecated_function( __METHOD__, '4.0', 'FrmProFieldsController::add_other_option' );
	882	+ _deprecated_function( __METHOD__, '4.0', 'FrmProFormsController::add_other_option' );
	883	+ if ( is_callable( 'FrmProFormsController::add_other_option' ) ) {
	884	+ FrmProFormsController::add_other_option();
	885	+ }
890	886	}
891	887
892	888	/**
893	889	* @deprecated 4.0
		@@ -915,6 +911,22 @@
915	911	* @return array
916	912	*/
917	913	public static function include_single_field( $field_id, $values, $form_id = 0 ) {
918	914	return FrmDeprecated::include_single_field( $field_id, $values, $form_id );
	915	+ }
	916	+
	917	+ /**
	918	+ * @deprecated 2.3
	919	+ * @codeCoverageIgnore
	920	+ */
	921	+ public static function edit_option() {
	922	+ FrmDeprecated::deprecated( __METHOD__, '2.3' );
	923	+ }
	924	+
	925	+ /**
	926	+ * @deprecated 2.3
	927	+ * @codeCoverageIgnore
	928	+ */
	929	+ public static function delete_option() {
	930	+ FrmDeprecated::deprecated( __METHOD__, '2.3' );
919	931	}
920	932	}