| @@ -158,9 +158,9 @@ | ||
| 158 | 158 | if ( '' == $field_array['blank'] && '1' === $field_array['required'] ) { |
| 159 | 159 | $field_array['blank'] = $frm_settings->blank_msg; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - if ( '' === $field_array['invalid'] ) { | |
| 162 | + if ( '' == $field_array['invalid'] ) { | |
| 163 | 163 | if ( 'captcha' === $field->type ) { |
| 164 | 164 | $field_array['invalid'] = $frm_settings->re_msg; |
| 165 | 165 | } else { |
| 166 | 166 | /* translators: %s: Field name */ |
| @@ -759,18 +759,13 @@ | ||
| 759 | 759 | |
| 760 | 760 | /** |
| 761 | 761 | * @param string $replace_with |
| 762 | 762 | * @param array $atts |
| 763 | - * @return string | |
| 764 | 763 | */ |
| 765 | 764 | private static function trigger_shortcode_atts( $replace_with, $atts ) { |
| 766 | 765 | $supported_atts = array( 'sanitize', 'sanitize_url' ); |
| 767 | 766 | $included_atts = array_intersect( $supported_atts, array_keys( $atts ) ); |
| 768 | 767 | foreach ( $included_atts as $included_att ) { |
| 769 | - if ( '0' === $atts[ $included_att ] ) { | |
| 770 | - // Skip any option that uses 0 so sanitize_url=0 does not encode. | |
| 771 | - continue; | |
| 772 | - } | |
| 773 | 768 | $function = 'atts_' . $included_att; |
| 774 | 769 | $replace_with = self::$function( $replace_with, $atts ); |
| 775 | 770 | } |
| 776 | 771 | return $replace_with; |
| @@ -1351,12 +1346,8 @@ | ||
| 1351 | 1346 | $replace[] = '[' . $old . ']'; |
| 1352 | 1347 | $replace_with[] = '[' . $new . ']'; |
| 1353 | 1348 | $replace[] = '[' . $old . ' '; |
| 1354 | 1349 | $replace_with[] = '[' . $new . ' '; |
| 1355 | - $replace[] = 'field_id="' . $old . '"'; | |
| 1356 | - $replace_with[] = 'field_id="' . $new . '"'; | |
| 1357 | - $replace[] = 'field_id=\"' . $old . '\"'; | |
| 1358 | - $replace_with[] = 'field_id=\"' . $new . '\"'; | |
| 1359 | 1350 | unset( $old, $new ); |
| 1360 | 1351 | } |
| 1361 | 1352 | if ( is_array( $val ) ) { |
| 1362 | 1353 | foreach ( $val as $k => $v ) { |
| @@ -1847,11 +1838,9 @@ | ||
| 1847 | 1838 | } |
| 1848 | 1839 | |
| 1849 | 1840 | /** |
| 1850 | 1841 | * @since 4.04 |
| 1851 | - * | |
| 1852 | 1842 | * @param array $args |
| 1853 | - * @return void | |
| 1854 | 1843 | */ |
| 1855 | 1844 | public static function show_add_field_buttons( $args ) { |
| 1856 | 1845 | $field_key = $args['field_key']; |
| 1857 | 1846 | $field_type = $args['field_type']; |
| @@ -2054,23 +2043,8 @@ | ||
| 2054 | 2043 | return $custom_attrs; |
| 2055 | 2044 | } |
| 2056 | 2045 | |
| 2057 | 2046 | /** |
| 2058 | - * Maybe adjust a field value based on type. | |
| 2059 | - * Some types require unserializing an array (@see self::field_type_requires_unserialize). | |
| 2060 | - * | |
| 2061 | - * @since 6.2 | |
| 2062 | - * | |
| 2063 | - * @param mixed $value | |
| 2064 | - * @param string $field_type | |
| 2065 | - * @return void | |
| 2066 | - */ | |
| 2067 | - public static function prepare_field_value( &$value, $field_type ) { | |
| 2068 | - $field_object = FrmFieldFactory::get_field_type( $field_type ); | |
| 2069 | - $value = $field_object->maybe_decode_value( $value ); | |
| 2070 | - } | |
| 2071 | - | |
| 2072 | - /** | |
| 2073 | 2047 | * @deprecated 4.0 |
| 2074 | 2048 | */ |
| 2075 | 2049 | public static function show_icon_link_js( $atts ) { |
| 2076 | 2050 | _deprecated_function( __METHOD__, '4.0' ); |
| @@ -2150,13 +2124,10 @@ | ||
| 2150 | 2124 | return FrmDeprecated::get_default_field_opts( $type, $field, $limit ); |
| 2151 | 2125 | } |
| 2152 | 2126 | |
| 2153 | 2127 | /** |
| 2154 | - * @deprecated 2.02.07 This is still referenced in the Highrise add on as of v1.06. | |
| 2128 | + * @deprecated 2.02.07 | |
| 2155 | 2129 | * @codeCoverageIgnore |
| 2156 | - * | |
| 2157 | - * @param array $args | |
| 2158 | - * @return string | |
| 2159 | 2130 | */ |
| 2160 | 2131 | public static function dropdown_categories( $args ) { |
| 2161 | 2132 | return FrmDeprecated::dropdown_categories( $args ); |
| 2162 | 2133 | } |
