| @@ -45,40 +45,14 @@ | ||
| 45 | 45 | * @param mixed $filter Filter to get the defaults for. |
| 46 | 46 | */ |
| 47 | 47 | public static function filter_with_defaults( $filter ) { |
| 48 | 48 | if ( $filter && isset( $filter['type'] ) ) { |
| 49 | - // Set default options. | |
| 50 | 49 | $defaults = self::get_defaults( $filter['type'] ); |
| 50 | + | |
| 51 | 51 | if ( $defaults ) { |
| 52 | 52 | $filter['options'] = array_replace_recursive( $defaults, $filter['options'] ); |
| 53 | 53 | } |
| 54 | - | |
| 55 | - // Set default label. | |
| 56 | - if ( ! isset( $filter['label'] ) ) { | |
| 57 | - $filter['label'] = ''; | |
| 58 | - } | |
| 59 | 54 | } |
| 60 | 55 | |
| 61 | 56 | return $filter; |
| 62 | - } | |
| 63 | - | |
| 64 | - /** | |
| 65 | - * Get general filter style defaults. | |
| 66 | - * | |
| 67 | - * @since 3.1.0 | |
| 68 | - */ | |
| 69 | - public static function get_general_style_defaults() { | |
| 70 | - $defaults = apply_filters( 'wpupg_filter_general_style_defaults', array( | |
| 71 | - 'display' => 'block', | |
| 72 | - 'alignment' => 'left', | |
| 73 | - 'spacing_vertical' => 10, | |
| 74 | - 'spacing_horizontal' => 10, | |
| 75 | - 'width' => 250, | |
| 76 | - 'label_display' => 'block', | |
| 77 | - 'label_alignment' => 'left', | |
| 78 | - 'label_font_size' => 14, | |
| 79 | - 'label_style' => 'bold', | |
| 80 | - ) ); | |
| 81 | - | |
| 82 | - return $defaults; | |
| 83 | 57 | } |
| 84 | 58 | } |
