@@ -104,7 +104,7 @@ |
||
104 | 104 | public static function add_module( $module ) { |
105 | 105 | |
106 | 106 | if ( ! in_array( $module, self::$modules, true ) ) { |
107 | - self::$modules[] = $module; |
|
107 | + self::$modules[ ] = $module; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | } |
@@ -46,12 +46,12 @@ |
||
46 | 46 | public function add_panel( $args ) { |
47 | 47 | global $wp_customize; |
48 | 48 | |
49 | - if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->panel_types ) ) { |
|
50 | - $args['type'] = 'default'; |
|
49 | + if ( ! isset( $args[ 'type' ] ) || ! array_key_exists( $args[ 'type' ], $this->panel_types ) ) { |
|
50 | + $args[ 'type' ] = 'default'; |
|
51 | 51 | } |
52 | - $panel_classname = $this->panel_types[ $args['type'] ]; |
|
52 | + $panel_classname = $this->panel_types[ $args[ 'type' ] ]; |
|
53 | 53 | |
54 | - $wp_customize->add_panel( new $panel_classname( $wp_customize, sanitize_key( $args['id'] ), $args ) ); |
|
54 | + $wp_customize->add_panel( new $panel_classname( $wp_customize, sanitize_key( $args[ 'id' ] ), $args ) ); |
|
55 | 55 | |
56 | 56 | } |
57 | 57 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | // Echo the styles. |
21 | 21 | $configs = Kirki::$config; |
22 | 22 | foreach ( $configs as $config_id => $args ) { |
23 | - if ( true === $args['disable_output'] ) { |
|
23 | + if ( true === $args[ 'disable_output' ] ) { |
|
24 | 24 | continue; |
25 | 25 | } |
26 | 26 |
@@ -49,16 +49,16 @@ |
||
49 | 49 | // The default class to be used when creating a section. |
50 | 50 | $section_classname = 'WP_Customize_Section'; |
51 | 51 | |
52 | - if ( isset( $args['type'] ) && array_key_exists( $args['type'], $this->section_types ) ) { |
|
53 | - $section_classname = $this->section_types[ $args['type'] ]; |
|
52 | + if ( isset( $args[ 'type' ] ) && array_key_exists( $args[ 'type' ], $this->section_types ) ) { |
|
53 | + $section_classname = $this->section_types[ $args[ 'type' ] ]; |
|
54 | 54 | } |
55 | - if ( isset( $args['type'] ) && 'kirki-outer' === $args['type'] ) { |
|
56 | - $args['type'] = 'outer'; |
|
55 | + if ( isset( $args[ 'type' ] ) && 'kirki-outer' === $args[ 'type' ] ) { |
|
56 | + $args[ 'type' ] = 'outer'; |
|
57 | 57 | $section_classname = 'WP_Customize_Section'; |
58 | 58 | } |
59 | 59 | |
60 | 60 | // Add the section. |
61 | - $wp_customize->add_section( new $section_classname( $wp_customize, sanitize_key( $args['id'] ), $args ) ); |
|
61 | + $wp_customize->add_section( new $section_classname( $wp_customize, sanitize_key( $args[ 'id' ] ), $args ) ); |
|
62 | 62 | |
63 | 63 | } |
64 | 64 | } |
@@ -36,8 +36,8 @@ |
||
36 | 36 | $css = ''; |
37 | 37 | if ( ! empty( Kirki::$sections ) ) { |
38 | 38 | foreach ( Kirki::$sections as $section_args ) { |
39 | - if ( isset( $section_args['id'] ) && isset( $section_args['type'] ) && 'outer' === $section_args['type'] || 'kirki-outer' === $section_args['type'] ) { |
|
40 | - $css .= '#customize-theme-controls li#accordion-section-' . $section_args['id'] . '{display:list-item!important;}'; |
|
39 | + if ( isset( $section_args[ 'id' ] ) && isset( $section_args[ 'type' ] ) && 'outer' === $section_args[ 'type' ] || 'kirki-outer' === $section_args[ 'type' ] ) { |
|
40 | + $css .= '#customize-theme-controls li#accordion-section-' . $section_args[ 'id' ] . '{display:list-item!important;}'; |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | } |
@@ -67,28 +67,28 @@ |
||
67 | 67 | |
68 | 68 | // Get the classname we'll be using to create our setting(s). |
69 | 69 | $classname = false; |
70 | - if ( isset( $args['option_type'] ) && array_key_exists( $args['option_type'], $this->setting_types ) ) { |
|
71 | - $classname = $this->setting_types[ $args['option_type'] ]; |
|
70 | + if ( isset( $args[ 'option_type' ] ) && array_key_exists( $args[ 'option_type' ], $this->setting_types ) ) { |
|
71 | + $classname = $this->setting_types[ $args[ 'option_type' ] ]; |
|
72 | 72 | } |
73 | - if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) { |
|
74 | - $args['type'] = 'default'; |
|
73 | + if ( ! isset( $args[ 'type' ] ) || ! array_key_exists( $args[ 'type' ], $this->setting_types ) ) { |
|
74 | + $args[ 'type' ] = 'default'; |
|
75 | 75 | } |
76 | - $classname = ! $classname ? $this->setting_types[ $args['type'] ] : $classname; |
|
76 | + $classname = ! $classname ? $this->setting_types[ $args[ 'type' ] ] : $classname; |
|
77 | 77 | |
78 | 78 | // If settings are defined as an array, then we need to go through them |
79 | 79 | // and call add_setting for each one of them separately. |
80 | - if ( isset( $args['settings'] ) && is_array( $args['settings'] ) ) { |
|
80 | + if ( isset( $args[ 'settings' ] ) && is_array( $args[ 'settings' ] ) ) { |
|
81 | 81 | |
82 | 82 | // Make sure defaults have been defined. |
83 | - if ( ! isset( $args['default'] ) || ! is_array( $args['default'] ) ) { |
|
84 | - $args['default'] = array(); |
|
83 | + if ( ! isset( $args[ 'default' ] ) || ! is_array( $args[ 'default' ] ) ) { |
|
84 | + $args[ 'default' ] = array(); |
|
85 | 85 | } |
86 | - foreach ( $args['settings'] as $key => $value ) { |
|
87 | - $default = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : ''; |
|
88 | - $this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] ); |
|
86 | + foreach ( $args[ 'settings' ] as $key => $value ) { |
|
87 | + $default = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : ''; |
|
88 | + $this->add_setting( $classname, $value, $default, $args[ 'option_type' ], $args[ 'capability' ], $args[ 'transport' ], $args[ 'sanitize_callback' ] ); |
|
89 | 89 | } |
90 | 90 | } |
91 | - $this->add_setting( $classname, $args['settings'], $args['default'], $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] ); |
|
91 | + $this->add_setting( $classname, $args[ 'settings' ], $args[ 'default' ], $args[ 'option_type' ], $args[ 'capability' ], $args[ 'transport' ], $args[ 'sanitize_callback' ] ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | // Apply the kirki/config filter. |
60 | 60 | $config = apply_filters( 'kirki/config', array() ); |
61 | - if ( isset( $config['url_path'] ) ) { |
|
62 | - Kirki::$url = $config['url_path']; |
|
61 | + if ( isset( $config[ 'url_path' ] ) ) { |
|
62 | + Kirki::$url = $config[ 'url_path' ]; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | // Make sure the right protocol is used. |
@@ -167,10 +167,10 @@ discard block |
||
167 | 167 | if ( ! empty( Kirki::$panels ) ) { |
168 | 168 | foreach ( Kirki::$panels as $panel_args ) { |
169 | 169 | // Extra checks for nested panels. |
170 | - if ( isset( $panel_args['panel'] ) ) { |
|
171 | - if ( isset( Kirki::$panels[ $panel_args['panel'] ] ) ) { |
|
170 | + if ( isset( $panel_args[ 'panel' ] ) ) { |
|
171 | + if ( isset( Kirki::$panels[ $panel_args[ 'panel' ] ] ) ) { |
|
172 | 172 | // Set the type to nested. |
173 | - $panel_args['type'] = 'kirki-nested'; |
|
173 | + $panel_args[ 'type' ] = 'kirki-nested'; |
|
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
@@ -188,14 +188,14 @@ discard block |
||
188 | 188 | if ( ! empty( Kirki::$sections ) ) { |
189 | 189 | foreach ( Kirki::$sections as $section_args ) { |
190 | 190 | // Extra checks for nested sections. |
191 | - if ( isset( $section_args['section'] ) ) { |
|
192 | - if ( isset( Kirki::$sections[ $section_args['section'] ] ) ) { |
|
191 | + if ( isset( $section_args[ 'section' ] ) ) { |
|
192 | + if ( isset( Kirki::$sections[ $section_args[ 'section' ] ] ) ) { |
|
193 | 193 | // Set the type to nested. |
194 | - $section_args['type'] = 'kirki-nested'; |
|
194 | + $section_args[ 'type' ] = 'kirki-nested'; |
|
195 | 195 | // We need to check if the parent section is nested inside a panel. |
196 | - $parent_section = Kirki::$sections[ $section_args['section'] ]; |
|
197 | - if ( isset( $parent_section['panel'] ) ) { |
|
198 | - $section_args['panel'] = $parent_section['panel']; |
|
196 | + $parent_section = Kirki::$sections[ $section_args[ 'section' ] ]; |
|
197 | + if ( isset( $parent_section[ 'panel' ] ) ) { |
|
198 | + $section_args[ 'panel' ] = $parent_section[ 'panel' ]; |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | } |
@@ -40,17 +40,17 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function typography_field_tweaks( $value, $field_id ) { |
42 | 42 | |
43 | - if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['type'] ) ) { |
|
44 | - if ( 'kirki-typography' === Kirki::$fields[ $field_id ]['type'] ) { |
|
43 | + if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'type' ] ) ) { |
|
44 | + if ( 'kirki-typography' === Kirki::$fields[ $field_id ][ 'type' ] ) { |
|
45 | 45 | |
46 | 46 | // Sanitize the value. |
47 | 47 | // This also adds font-weight if it doesn't already exist. |
48 | 48 | $value = Kirki_Field_Typography::sanitize( $value ); |
49 | 49 | |
50 | 50 | // Combine font-family and font-backup. |
51 | - if ( isset( $value['font-family'] ) && isset( $value['font-backup'] ) ) { |
|
52 | - $value['font-family'] .= ', ' . $value['font-backup']; |
|
53 | - unset( $value['font-backup'] ); |
|
51 | + if ( isset( $value[ 'font-family' ] ) && isset( $value[ 'font-backup' ] ) ) { |
|
52 | + $value[ 'font-family' ] .= ', ' . $value[ 'font-backup' ]; |
|
53 | + unset( $value[ 'font-backup' ] ); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | } |
@@ -87,39 +87,39 @@ discard block |
||
87 | 87 | $config_id = 'global'; |
88 | 88 | } |
89 | 89 | |
90 | - if ( 'theme_mod' === Kirki::$config[ $config_id ]['option_type'] ) { |
|
90 | + if ( 'theme_mod' === Kirki::$config[ $config_id ][ 'option_type' ] ) { |
|
91 | 91 | |
92 | 92 | // We're using theme_mods so just get the value using get_theme_mod. |
93 | 93 | $default_value = null; |
94 | - if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) { |
|
95 | - $default_value = Kirki::$fields[ $field_id ]['default']; |
|
94 | + if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) { |
|
95 | + $default_value = Kirki::$fields[ $field_id ][ 'default' ]; |
|
96 | 96 | } |
97 | 97 | $value = get_theme_mod( $field_id, $default_value ); |
98 | 98 | return apply_filters( 'kirki/values/get_value', $value, $field_id ); |
99 | 99 | } |
100 | 100 | |
101 | - if ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) { |
|
101 | + if ( 'option' === Kirki::$config[ $config_id ][ 'option_type' ] ) { |
|
102 | 102 | |
103 | 103 | // We're using options. |
104 | - if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) { |
|
104 | + if ( '' !== Kirki::$config[ $config_id ][ 'option_name' ] ) { |
|
105 | 105 | |
106 | 106 | // Options are serialized as a single option in the db. |
107 | 107 | // We'll have to get the option and then get the item from the array. |
108 | - $options = get_option( Kirki::$config[ $config_id ]['option_name'] ); |
|
108 | + $options = get_option( Kirki::$config[ $config_id ][ 'option_name' ] ); |
|
109 | 109 | |
110 | - if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']' ] ) ) { |
|
111 | - $field_id = Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']'; |
|
110 | + if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']' ] ) ) { |
|
111 | + $field_id = Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']'; |
|
112 | 112 | } |
113 | - $setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ]['option_name'] . '[', '', $field_id ) ); |
|
113 | + $setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ][ 'option_name' ] . '[', '', $field_id ) ); |
|
114 | 114 | |
115 | - $default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) ? Kirki::$fields[ $field_id ]['default'] : ''; |
|
115 | + $default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) ? Kirki::$fields[ $field_id ][ 'default' ] : ''; |
|
116 | 116 | $value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value; |
117 | 117 | $value = maybe_unserialize( $value ); |
118 | 118 | return apply_filters( 'kirki/values/get_value', $value, $field_id ); |
119 | 119 | } |
120 | 120 | |
121 | 121 | // Each option separately saved in the db. |
122 | - $value = get_option( $field_id, Kirki::$fields[ $field_id ]['default'] ); |
|
122 | + $value = get_option( $field_id, Kirki::$fields[ $field_id ][ 'default' ] ); |
|
123 | 123 | return apply_filters( 'kirki/values/get_value', $value, $field_id ); |
124 | 124 | |
125 | 125 | } // End if(). |
@@ -137,18 +137,18 @@ discard block |
||
137 | 137 | * @return string|array |
138 | 138 | */ |
139 | 139 | public static function get_sanitized_field_value( $field ) { |
140 | - $value = $field['default']; |
|
141 | - if ( isset( $field['option_type'] ) && 'theme_mod' === $field['option_type'] ) { |
|
142 | - $value = get_theme_mod( $field['settings'], $field['default'] ); |
|
143 | - } elseif ( isset( $field['option_type'] ) && 'option' === $field['option_type'] ) { |
|
144 | - if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) { |
|
145 | - $all_values = get_option( $field['option_name'], array() ); |
|
146 | - $sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] ); |
|
140 | + $value = $field[ 'default' ]; |
|
141 | + if ( isset( $field[ 'option_type' ] ) && 'theme_mod' === $field[ 'option_type' ] ) { |
|
142 | + $value = get_theme_mod( $field[ 'settings' ], $field[ 'default' ] ); |
|
143 | + } elseif ( isset( $field[ 'option_type' ] ) && 'option' === $field[ 'option_type' ] ) { |
|
144 | + if ( isset( $field[ 'option_name' ] ) && '' !== $field[ 'option_name' ] ) { |
|
145 | + $all_values = get_option( $field[ 'option_name' ], array() ); |
|
146 | + $sub_setting_id = str_replace( array( ']', $field[ 'option_name' ] . '[' ), '', $field[ 'settings' ] ); |
|
147 | 147 | if ( isset( $all_values[ $sub_setting_id ] ) ) { |
148 | 148 | $value = $all_values[ $sub_setting_id ]; |
149 | 149 | } |
150 | 150 | } else { |
151 | - $value = get_option( $field['settings'], $field['default'] ); |
|
151 | + $value = get_option( $field[ 'settings' ], $field[ 'default' ] ); |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 |
@@ -43,7 +43,7 @@ |
||
43 | 43 | include_once ABSPATH . 'wp-admin/includes/plugin.php'; |
44 | 44 | } |
45 | 45 | $data = get_plugin_data( KIRKI_PLUGIN_FILE ); |
46 | - $version = ( isset( $data['Version'] ) ) ? $data['Version'] : false; |
|
46 | + $version = ( isset( $data[ 'Version' ] ) ) ? $data[ 'Version' ] : false; |
|
47 | 47 | define( 'KIRKI_VERSION', $version ); |
48 | 48 | } |
49 | 49 |