@@ -49,18 +49,18 @@ discard block |
||
| 49 | 49 | protected function set_default() { |
| 50 | 50 | |
| 51 | 51 | // Accomodate the use of font-weight and convert to variant. |
| 52 | - if ( isset( $this->default['font-weight'] ) ) { |
|
| 53 | - $this->default['variant'] = ( 'regular' === $this->default['font-weight'] ) ? 400 : (string) intval( $this->default['font-weight'] ); |
|
| 52 | + if ( isset( $this->default[ 'font-weight' ] ) ) { |
|
| 53 | + $this->default[ 'variant' ] = ( 'regular' === $this->default[ 'font-weight' ] ) ? 400 : (string) intval( $this->default[ 'font-weight' ] ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Make sure letter-spacing has units. |
| 57 | - if ( isset( $this->default['letter-spacing'] ) && is_numeric( $this->default['letter-spacing'] ) && $this->default['letter-spacing'] ) { |
|
| 58 | - $this->default['letter-spacing'] .= 'px'; |
|
| 57 | + if ( isset( $this->default[ 'letter-spacing' ] ) && is_numeric( $this->default[ 'letter-spacing' ] ) && $this->default[ 'letter-spacing' ] ) { |
|
| 58 | + $this->default[ 'letter-spacing' ] .= 'px'; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // Make sure we use "subsets" instead of "subset". |
| 62 | - if ( isset( $this->default['subset'] ) && ! empty( $this->default['subset'] ) && ( ! isset( $this->default['subsets'] ) || empty( $this->default['subsets'] ) ) ) { |
|
| 63 | - $this->default['subsets'] = $this->default['subset']; |
|
| 62 | + if ( isset( $this->default[ 'subset' ] ) && ! empty( $this->default[ 'subset' ] ) && ( ! isset( $this->default[ 'subsets' ] ) || empty( $this->default[ 'subsets' ] ) ) ) { |
|
| 63 | + $this->default[ 'subsets' ] = $this->default[ 'subset' ]; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
@@ -111,15 +111,15 @@ discard block |
||
| 111 | 111 | foreach ( $this->output as $output ) { |
| 112 | 112 | |
| 113 | 113 | // If 'element' or 'property' are not defined, skip this. |
| 114 | - if ( ! isset( $output['element'] ) ) { |
|
| 114 | + if ( ! isset( $output[ 'element' ] ) ) { |
|
| 115 | 115 | continue; |
| 116 | 116 | } |
| 117 | - if ( is_array( $output['element'] ) ) { |
|
| 118 | - $output['element'] = implode( ',', $output['element'] ); |
|
| 117 | + if ( is_array( $output[ 'element' ] ) ) { |
|
| 118 | + $output[ 'element' ] = implode( ',', $output[ 'element' ] ); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // If we got this far, it's safe to add this. |
| 122 | - $js_vars[] = $output; |
|
| 122 | + $js_vars[ ] = $output; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // Did we manage to get all the items from 'output'? |
@@ -151,45 +151,45 @@ discard block |
||
| 151 | 151 | foreach ( $value as $key => $val ) { |
| 152 | 152 | switch ( $key ) { |
| 153 | 153 | case 'font-family': |
| 154 | - $value['font-family'] = esc_attr( $val ); |
|
| 154 | + $value[ 'font-family' ] = esc_attr( $val ); |
|
| 155 | 155 | break; |
| 156 | 156 | case 'font-weight': |
| 157 | - if ( isset( $value['variant'] ) ) { |
|
| 157 | + if ( isset( $value[ 'variant' ] ) ) { |
|
| 158 | 158 | break; |
| 159 | 159 | } |
| 160 | - $value['variant'] = $val; |
|
| 161 | - if ( isset( $value['font-style'] ) && 'italic' === $value['font-style'] ) { |
|
| 162 | - $value['variant'] = ( '400' !== $val || 400 !== $val ) ? $value['variant'] . 'italic' : 'italic'; |
|
| 160 | + $value[ 'variant' ] = $val; |
|
| 161 | + if ( isset( $value[ 'font-style' ] ) && 'italic' === $value[ 'font-style' ] ) { |
|
| 162 | + $value[ 'variant' ] = ( '400' !== $val || 400 !== $val ) ? $value[ 'variant' ] . 'italic' : 'italic'; |
|
| 163 | 163 | } |
| 164 | 164 | break; |
| 165 | 165 | case 'variant': |
| 166 | 166 | // Use 'regular' instead of 400 for font-variant. |
| 167 | - $value['variant'] = ( 400 === $val || '400' === $val ) ? 'regular' : $val; |
|
| 167 | + $value[ 'variant' ] = ( 400 === $val || '400' === $val ) ? 'regular' : $val; |
|
| 168 | 168 | // Get font-weight from variant. |
| 169 | - $value['font-weight'] = filter_var( $value['variant'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ); |
|
| 170 | - $value['font-weight'] = ( 'regular' === $value['variant'] || 'italic' === $value['variant'] ) ? 400 : absint( $value['font-weight'] ); |
|
| 169 | + $value[ 'font-weight' ] = filter_var( $value[ 'variant' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ); |
|
| 170 | + $value[ 'font-weight' ] = ( 'regular' === $value[ 'variant' ] || 'italic' === $value[ 'variant' ] ) ? 400 : absint( $value[ 'font-weight' ] ); |
|
| 171 | 171 | // Get font-style from variant. |
| 172 | - if ( ! isset( $value['font-style'] ) ) { |
|
| 173 | - $value['font-style'] = ( false === strpos( $value['variant'], 'italic' ) ) ? 'normal' : 'italic'; |
|
| 172 | + if ( ! isset( $value[ 'font-style' ] ) ) { |
|
| 173 | + $value[ 'font-style' ] = ( false === strpos( $value[ 'variant' ], 'italic' ) ) ? 'normal' : 'italic'; |
|
| 174 | 174 | } |
| 175 | 175 | break; |
| 176 | 176 | case 'subset': |
| 177 | 177 | // Make sure the saved value is "subsets" (plural) and not "subset". |
| 178 | 178 | // This is for compatibility with older versions. |
| 179 | - if ( ! empty( $value['subset'] ) && ! isset( $value['subsets'] ) || empty( $value['subset'] ) ) { |
|
| 180 | - $value['subsets'] = $value['subset']; |
|
| 179 | + if ( ! empty( $value[ 'subset' ] ) && ! isset( $value[ 'subsets' ] ) || empty( $value[ 'subset' ] ) ) { |
|
| 180 | + $value[ 'subsets' ] = $value[ 'subset' ]; |
|
| 181 | 181 | } |
| 182 | - unset( $value['subset'] ); |
|
| 182 | + unset( $value[ 'subset' ] ); |
|
| 183 | 183 | // Make sure we're using a valid subset. |
| 184 | 184 | $valid_subsets = Kirki_Fonts::get_google_font_subsets(); |
| 185 | 185 | $subsets_ok = array(); |
| 186 | - $value['subsets'] = (array) $value['subsets']; |
|
| 187 | - foreach ( $value['subsets'] as $subset ) { |
|
| 186 | + $value[ 'subsets' ] = (array) $value[ 'subsets' ]; |
|
| 187 | + foreach ( $value[ 'subsets' ] as $subset ) { |
|
| 188 | 188 | if ( array_key_exists( $subset, $valid_subsets ) ) { |
| 189 | - $subsets_ok[] = $subset; |
|
| 189 | + $subsets_ok[ ] = $subset; |
|
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | - $value['subsets'] = $subsets_ok; |
|
| 192 | + $value[ 'subsets' ] = $subsets_ok; |
|
| 193 | 193 | break; |
| 194 | 194 | case 'font-size': |
| 195 | 195 | case 'letter-spacing': |
@@ -199,21 +199,21 @@ discard block |
||
| 199 | 199 | break; |
| 200 | 200 | case 'text-align': |
| 201 | 201 | if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) { |
| 202 | - $value['text-align'] = 'inherit'; |
|
| 202 | + $value[ 'text-align' ] = 'inherit'; |
|
| 203 | 203 | } |
| 204 | 204 | break; |
| 205 | 205 | case 'text-transform': |
| 206 | 206 | if ( ! in_array( $val, array( 'none', 'capitalize', 'uppercase', 'lowercase', 'initial', 'inherit' ), true ) ) { |
| 207 | - $value['text-transform'] = 'none'; |
|
| 207 | + $value[ 'text-transform' ] = 'none'; |
|
| 208 | 208 | } |
| 209 | 209 | break; |
| 210 | 210 | case 'text-decoration': |
| 211 | 211 | if ( ! in_array( $val, array( 'none', 'underline', 'overline', 'line-through', 'initial', 'inherit' ), true ) ) { |
| 212 | - $value['text-transform'] = 'none'; |
|
| 212 | + $value[ 'text-transform' ] = 'none'; |
|
| 213 | 213 | } |
| 214 | 214 | break; |
| 215 | 215 | case 'color': |
| 216 | - $value['color'] = ariColor::newColor( $val )->toCSS( 'hex' ); |
|
| 216 | + $value[ 'color' ] = ariColor::newColor( $val )->toCSS( 'hex' ); |
|
| 217 | 217 | break; |
| 218 | 218 | } // End switch(). |
| 219 | 219 | } // End foreach(). |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | // Set a default class name. |
| 67 | 67 | $class_name = 'WP_Customize_Control'; |
| 68 | 68 | // Get the classname from the array of control classnames. |
| 69 | - if ( array_key_exists( $args['type'], self::$control_types ) ) { |
|
| 70 | - $class_name = self::$control_types[ $args['type'] ]; |
|
| 69 | + if ( array_key_exists( $args[ 'type' ], self::$control_types ) ) { |
|
| 70 | + $class_name = self::$control_types[ $args[ 'type' ] ]; |
|
| 71 | 71 | } |
| 72 | 72 | return $class_name; |
| 73 | 73 | |
@@ -84,17 +84,17 @@ discard block |
||
| 84 | 84 | // Get the name of the class we're going to use. |
| 85 | 85 | $class_name = $this->get_control_class_name( $args ); |
| 86 | 86 | // Fixes https://github.com/aristath/kirki/issues/1622. |
| 87 | - if ( 'kirki-code' === $args['type'] && class_exists( 'WP_Customize_Code_Editor_Control' ) ) { |
|
| 87 | + if ( 'kirki-code' === $args[ 'type' ] && class_exists( 'WP_Customize_Code_Editor_Control' ) ) { |
|
| 88 | 88 | $this->wp_customize->add_control( |
| 89 | 89 | new WP_Customize_Code_Editor_Control( |
| 90 | 90 | $this->wp_customize, |
| 91 | - $args['settings'], |
|
| 91 | + $args[ 'settings' ], |
|
| 92 | 92 | array( |
| 93 | - 'label' => isset( $args['label'] ) ? $args['label'] : '', |
|
| 94 | - 'section' => $args['section'], |
|
| 95 | - 'settings' => $args['settings'], |
|
| 96 | - 'code_type' => isset( $args['choices'] ) ? $args['choices']['language'] : 'text/css', |
|
| 97 | - 'priority' => isset( $args['priority'] ) ? $args['priority'] : 10, |
|
| 93 | + 'label' => isset( $args[ 'label' ] ) ? $args[ 'label' ] : '', |
|
| 94 | + 'section' => $args[ 'section' ], |
|
| 95 | + 'settings' => $args[ 'settings' ], |
|
| 96 | + 'code_type' => isset( $args[ 'choices' ] ) ? $args[ 'choices' ][ 'language' ] : 'text/css', |
|
| 97 | + 'priority' => isset( $args[ 'priority' ] ) ? $args[ 'priority' ] : 10, |
|
| 98 | 98 | 'input_attrs' => array( |
| 99 | 99 | 'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4', |
| 100 | 100 | ), |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // Add the control. |
| 108 | - $this->wp_customize->add_control( new $class_name( $this->wp_customize, $args['settings'], $args ) ); |
|
| 108 | + $this->wp_customize->add_control( new $class_name( $this->wp_customize, $args[ 'settings' ], $args ) ); |
|
| 109 | 109 | |
| 110 | 110 | } |
| 111 | 111 | |
@@ -227,28 +227,28 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | public function __construct( $config_id = 'global', $args = array() ) { |
| 229 | 229 | |
| 230 | - if ( isset( $args['setting'] ) && ! empty( $args['setting'] ) && ( ! isset( $args['settings'] ) || empty( $args['settings'] ) ) ) { |
|
| 230 | + if ( isset( $args[ 'setting' ] ) && ! empty( $args[ 'setting' ] ) && ( ! isset( $args[ 'settings' ] ) || empty( $args[ 'settings' ] ) ) ) { |
|
| 231 | 231 | /* translators: %s represents the field ID where the error occurs. */ |
| 232 | - _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args['settings'] ) ), '3.0.10' ); |
|
| 233 | - $args['settings'] = $args['setting']; |
|
| 234 | - unset( $args['setting'] ); |
|
| 232 | + _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args[ 'settings' ] ) ), '3.0.10' ); |
|
| 233 | + $args[ 'settings' ] = $args[ 'setting' ]; |
|
| 234 | + unset( $args[ 'setting' ] ); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | // In case the user only provides 1 argument, |
| 238 | 238 | // assume that the provided argument is $args and set $config_id = 'global'. |
| 239 | 239 | if ( is_array( $config_id ) && empty( $args ) ) { |
| 240 | 240 | /* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */ |
| 241 | - _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' ); |
|
| 241 | + _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' ); |
|
| 242 | 242 | $args = $config_id; |
| 243 | 243 | $config_id = 'global'; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - $args['kirki_config'] = $config_id; |
|
| 246 | + $args[ 'kirki_config' ] = $config_id; |
|
| 247 | 247 | |
| 248 | 248 | $this->kirki_config = trim( esc_attr( $config_id ) ); |
| 249 | 249 | if ( '' === $config_id ) { |
| 250 | 250 | /* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */ |
| 251 | - _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' ); |
|
| 251 | + _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' ); |
|
| 252 | 252 | $this->kirki_config = 'global'; |
| 253 | 253 | } |
| 254 | 254 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $defaults = get_class_vars( __CLASS__ ); |
| 257 | 257 | |
| 258 | 258 | // Get the config arguments, and merge them with the defaults. |
| 259 | - $config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array(); |
|
| 259 | + $config_defaults = ( isset( Kirki::$config[ 'global' ] ) ) ? Kirki::$config[ 'global' ] : array(); |
|
| 260 | 260 | if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) { |
| 261 | 261 | $config_defaults = Kirki::$config[ $this->kirki_config ]; |
| 262 | 262 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | $this->partial_refresh = array(); |
| 405 | 405 | } |
| 406 | 406 | foreach ( $this->partial_refresh as $id => $args ) { |
| 407 | - if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) { |
|
| 407 | + if ( ! is_array( $args ) || ! isset( $args[ 'selector' ] ) || ! isset( $args[ 'render_callback' ] ) || ! is_callable( $args[ 'render_callback' ] ) ) { |
|
| 408 | 408 | /* translators: %1$s represents the field ID where the error occurs. */ |
| 409 | 409 | _doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' ); |
| 410 | 410 | unset( $this->partial_refresh[ $id ] ); |
@@ -442,8 +442,8 @@ discard block |
||
| 442 | 442 | } |
| 443 | 443 | } |
| 444 | 444 | $this->settings = $settings; |
| 445 | - if ( isset( $this->settings['kirki_placeholder_setting'] ) ) { |
|
| 446 | - $this->settings = $this->settings['kirki_placeholder_setting']; |
|
| 445 | + if ( isset( $this->settings[ 'kirki_placeholder_setting' ] ) ) { |
|
| 446 | + $this->settings = $this->settings[ 'kirki_placeholder_setting' ]; |
|
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | protected function set_active_callback() { |
| 458 | 458 | |
| 459 | 459 | if ( is_array( $this->active_callback ) && ! is_callable( $this->active_callback ) ) { |
| 460 | - if ( isset( $this->active_callback[0] ) ) { |
|
| 460 | + if ( isset( $this->active_callback[ 0 ] ) ) { |
|
| 461 | 461 | $this->required = $this->active_callback; |
| 462 | 462 | } |
| 463 | 463 | } |
@@ -543,34 +543,34 @@ discard block |
||
| 543 | 543 | ); |
| 544 | 544 | } |
| 545 | 545 | // Convert to array of arrays if needed. |
| 546 | - if ( isset( $this->output['element'] ) ) { |
|
| 546 | + if ( isset( $this->output[ 'element' ] ) ) { |
|
| 547 | 547 | /* translators: The field ID where the error occurs. */ |
| 548 | 548 | _doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"output" invalid format in field %s. The "output" argument should be defined as an array of arrays.', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' ); |
| 549 | 549 | $this->output = array( $this->output ); |
| 550 | 550 | } |
| 551 | 551 | foreach ( $this->output as $key => $output ) { |
| 552 | - if ( empty( $output ) || ! isset( $output['element'] ) ) { |
|
| 552 | + if ( empty( $output ) || ! isset( $output[ 'element' ] ) ) { |
|
| 553 | 553 | unset( $this->output[ $key ] ); |
| 554 | 554 | continue; |
| 555 | 555 | } |
| 556 | - if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) { |
|
| 557 | - $this->output[ $key ]['sanitize_callback'] = $output['callback']; |
|
| 556 | + if ( ! isset( $output[ 'sanitize_callback' ] ) && isset( $output[ 'callback' ] ) ) { |
|
| 557 | + $this->output[ $key ][ 'sanitize_callback' ] = $output[ 'callback' ]; |
|
| 558 | 558 | } |
| 559 | 559 | // Convert element arrays to strings. |
| 560 | - if ( isset( $output['element'] ) && is_array( $output['element'] ) ) { |
|
| 561 | - $this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] ); |
|
| 562 | - sort( $this->output[ $key ]['element'] ); |
|
| 560 | + if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) { |
|
| 561 | + $this->output[ $key ][ 'element' ] = array_unique( $this->output[ $key ][ 'element' ] ); |
|
| 562 | + sort( $this->output[ $key ][ 'element' ] ); |
|
| 563 | 563 | |
| 564 | 564 | // Trim each element in the array. |
| 565 | - foreach ( $this->output[ $key ]['element'] as $index => $element ) { |
|
| 566 | - $this->output[ $key ]['element'][ $index ] = trim( $element ); |
|
| 565 | + foreach ( $this->output[ $key ][ 'element' ] as $index => $element ) { |
|
| 566 | + $this->output[ $key ][ 'element' ][ $index ] = trim( $element ); |
|
| 567 | 567 | } |
| 568 | - $this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] ); |
|
| 568 | + $this->output[ $key ][ 'element' ] = implode( ',', $this->output[ $key ][ 'element' ] ); |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | // Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751. |
| 572 | - $this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] ); |
|
| 573 | - $this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) ); |
|
| 572 | + $this->output[ $key ][ 'element' ] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ][ 'element' ] ); |
|
| 573 | + $this->output[ $key ][ 'element' ] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ][ 'element' ] ) ); |
|
| 574 | 574 | } |
| 575 | 575 | } |
| 576 | 576 | |
@@ -603,23 +603,23 @@ discard block |
||
| 603 | 603 | |
| 604 | 604 | // Start going through each item in the $output array. |
| 605 | 605 | foreach ( $this->output as $output ) { |
| 606 | - $output['function'] = ( isset( $output['function'] ) ) ? $output['function'] : 'style'; |
|
| 606 | + $output[ 'function' ] = ( isset( $output[ 'function' ] ) ) ? $output[ 'function' ] : 'style'; |
|
| 607 | 607 | |
| 608 | 608 | // If 'element' or 'property' are not defined, skip this. |
| 609 | - if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) { |
|
| 609 | + if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) { |
|
| 610 | 610 | continue; |
| 611 | 611 | } |
| 612 | - if ( is_array( $output['element'] ) ) { |
|
| 613 | - $output['element'] = implode( ',', $output['element'] ); |
|
| 612 | + if ( is_array( $output[ 'element' ] ) ) { |
|
| 613 | + $output[ 'element' ] = implode( ',', $output[ 'element' ] ); |
|
| 614 | 614 | } |
| 615 | 615 | |
| 616 | 616 | // If there's a sanitize_callback defined skip this, unless we also have a js_callback defined. |
| 617 | - if ( isset( $output['sanitize_callback'] ) && ! empty( $output['sanitize_callback'] ) && ! isset( $output['js_callback'] ) ) { |
|
| 617 | + if ( isset( $output[ 'sanitize_callback' ] ) && ! empty( $output[ 'sanitize_callback' ] ) && ! isset( $output[ 'js_callback' ] ) ) { |
|
| 618 | 618 | continue; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | // If we got this far, it's safe to add this. |
| 622 | - $js_vars[] = $output; |
|
| 622 | + $js_vars[ ] = $output; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | // Did we manage to get all the items from 'output'? |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | $variable = ( is_string( $this->variables ) && ! empty( $this->variables ) ) ? $this->variables : false; |
| 645 | 645 | $this->variables = array(); |
| 646 | 646 | if ( $variable && empty( $this->variables ) ) { |
| 647 | - $this->variables[0]['name'] = $variable; |
|
| 647 | + $this->variables[ 0 ][ 'name' ] = $variable; |
|
| 648 | 648 | } |
| 649 | 649 | } |
| 650 | 650 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | // Handle the arguments, merge one by one. |
| 38 | 38 | $args = func_get_args(); |
| 39 | - $array = $args[0]; |
|
| 39 | + $array = $args[ 0 ]; |
|
| 40 | 40 | if ( ! is_array( $array ) ) { |
| 41 | 41 | return $array; |
| 42 | 42 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if ( ! empty( $attachment ) ) { |
| 115 | - return $attachment[0]; |
|
| 115 | + return $attachment[ 0 ]; |
|
| 116 | 116 | } |
| 117 | 117 | return 0; |
| 118 | 118 | } |
@@ -129,10 +129,10 @@ discard block |
||
| 129 | 129 | $image = wp_get_attachment_image_src( $image_id, 'full' ); |
| 130 | 130 | |
| 131 | 131 | return array( |
| 132 | - 'url' => $image[0], |
|
| 133 | - 'width' => $image[1], |
|
| 134 | - 'height' => $image[2], |
|
| 135 | - 'thumbnail' => $image[3], |
|
| 132 | + 'url' => $image[ 0 ], |
|
| 133 | + 'width' => $image[ 1 ], |
|
| 134 | + 'height' => $image[ 2 ], |
|
| 135 | + 'thumbnail' => $image[ 3 ], |
|
| 136 | 136 | ); |
| 137 | 137 | |
| 138 | 138 | } |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | 'suppress_filters' => false, |
| 154 | 154 | ) |
| 155 | 155 | ); |
| 156 | - } elseif ( is_array( $args ) && ! isset( $args['suppress_filters'] ) ) { |
|
| 157 | - $args['suppress_filters'] = false; |
|
| 156 | + } elseif ( is_array( $args ) && ! isset( $args[ 'suppress_filters' ] ) ) { |
|
| 157 | + $args[ 'suppress_filters' ] = false; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // Get the posts. |
@@ -303,41 +303,41 @@ discard block |
||
| 303 | 303 | $key = absint( $context ) / 100; |
| 304 | 304 | if ( 'A100' === $context ) { |
| 305 | 305 | $key = 10; |
| 306 | - unset( $colors['grey'] ); |
|
| 306 | + unset( $colors[ 'grey' ] ); |
|
| 307 | 307 | } elseif ( 'A200' === $context ) { |
| 308 | 308 | $key = 11; |
| 309 | - unset( $colors['grey'] ); |
|
| 309 | + unset( $colors[ 'grey' ] ); |
|
| 310 | 310 | } elseif ( 'A400' === $context ) { |
| 311 | 311 | $key = 12; |
| 312 | - unset( $colors['grey'] ); |
|
| 312 | + unset( $colors[ 'grey' ] ); |
|
| 313 | 313 | } elseif ( 'A700' === $context ) { |
| 314 | 314 | $key = 13; |
| 315 | - unset( $colors['grey'] ); |
|
| 315 | + unset( $colors[ 'grey' ] ); |
|
| 316 | 316 | } |
| 317 | - unset( $colors['primary'] ); |
|
| 317 | + unset( $colors[ 'primary' ] ); |
|
| 318 | 318 | $position_colors = array(); |
| 319 | 319 | foreach ( $colors as $color_family ) { |
| 320 | 320 | if ( isset( $color_family[ $key ] ) ) { |
| 321 | - $position_colors[] = $color_family[ $key ]; |
|
| 321 | + $position_colors[ ] = $color_family[ $key ]; |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | return $position_colors; |
| 325 | 325 | case 'all': |
| 326 | - unset( $colors['primary'] ); |
|
| 326 | + unset( $colors[ 'primary' ] ); |
|
| 327 | 327 | $all_colors = array(); |
| 328 | 328 | foreach ( $colors as $color_family ) { |
| 329 | 329 | foreach ( $color_family as $color ) { |
| 330 | - $all_colors[] = $color; |
|
| 330 | + $all_colors[ ] = $color; |
|
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | return $all_colors; |
| 334 | 334 | case 'primary': |
| 335 | - return $colors['primary']; |
|
| 335 | + return $colors[ 'primary' ]; |
|
| 336 | 336 | default: |
| 337 | 337 | if ( isset( $colors[ $context ] ) ) { |
| 338 | 338 | return $colors[ $context ]; |
| 339 | 339 | } |
| 340 | - return $colors['primary']; |
|
| 340 | + return $colors[ 'primary' ]; |
|
| 341 | 341 | } // End switch(). |
| 342 | 342 | } |
| 343 | 343 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | $config = Kirki_Config::get_instance( $config_id, $args ); |
| 116 | 116 | $config_args = $config->get_config(); |
| 117 | - self::$config[ $config_args['id'] ] = $config_args; |
|
| 117 | + self::$config[ $config_args[ 'id' ] ] = $config_args; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public static function add_panel( $id = '', $args = array() ) { |
| 129 | 129 | |
| 130 | - $args['id'] = esc_attr( $id ); |
|
| 131 | - $args['description'] = ( isset( $args['description'] ) ) ? esc_textarea( $args['description'] ) : ''; |
|
| 132 | - $args['priority'] = ( isset( $args['priority'] ) ) ? esc_attr( $args['priority'] ) : 10; |
|
| 133 | - $args['type'] = ( isset( $args['type'] ) ) ? $args['type'] : 'default'; |
|
| 134 | - $args['type'] = 'kirki-' . $args['type']; |
|
| 130 | + $args[ 'id' ] = esc_attr( $id ); |
|
| 131 | + $args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? esc_textarea( $args[ 'description' ] ) : ''; |
|
| 132 | + $args[ 'priority' ] = ( isset( $args[ 'priority' ] ) ) ? esc_attr( $args[ 'priority' ] ) : 10; |
|
| 133 | + $args[ 'type' ] = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default'; |
|
| 134 | + $args[ 'type' ] = 'kirki-' . $args[ 'type' ]; |
|
| 135 | 135 | |
| 136 | - self::$panels[ $args['id'] ] = $args; |
|
| 136 | + self::$panels[ $args[ 'id' ] ] = $args; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -146,14 +146,14 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public static function add_section( $id, $args ) { |
| 148 | 148 | |
| 149 | - $args['id'] = esc_attr( $id ); |
|
| 150 | - $args['panel'] = ( isset( $args['panel'] ) ) ? esc_attr( $args['panel'] ) : ''; |
|
| 151 | - $args['description'] = ( isset( $args['description'] ) ) ? esc_textarea( $args['description'] ) : ''; |
|
| 152 | - $args['priority'] = ( isset( $args['priority'] ) ) ? esc_attr( $args['priority'] ) : 10; |
|
| 153 | - $args['type'] = ( isset( $args['type'] ) ) ? $args['type'] : 'default'; |
|
| 154 | - $args['type'] = 'kirki-' . $args['type']; |
|
| 149 | + $args[ 'id' ] = esc_attr( $id ); |
|
| 150 | + $args[ 'panel' ] = ( isset( $args[ 'panel' ] ) ) ? esc_attr( $args[ 'panel' ] ) : ''; |
|
| 151 | + $args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? esc_textarea( $args[ 'description' ] ) : ''; |
|
| 152 | + $args[ 'priority' ] = ( isset( $args[ 'priority' ] ) ) ? esc_attr( $args[ 'priority' ] ) : 10; |
|
| 153 | + $args[ 'type' ] = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default'; |
|
| 154 | + $args[ 'type' ] = 'kirki-' . $args[ 'type' ]; |
|
| 155 | 155 | |
| 156 | - self::$sections[ $args['id'] ] = $args; |
|
| 156 | + self::$sections[ $args[ 'id' ] ] = $args; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -171,11 +171,11 @@ discard block |
||
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | // Early exit if 'type' is not defined. |
| 174 | - if ( ! isset( $args['type'] ) ) { |
|
| 174 | + if ( ! isset( $args[ 'type' ] ) ) { |
|
| 175 | 175 | return; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - $str = str_replace( array( '-', '_' ), ' ', $args['type'] ); |
|
| 178 | + $str = str_replace( array( '-', '_' ), ' ', $args[ 'type' ] ); |
|
| 179 | 179 | $classname = 'Kirki_Field_' . str_replace( ' ', '_', ucwords( $str ) ); |
| 180 | 180 | if ( class_exists( $classname ) ) { |
| 181 | 181 | new $classname( $config_id, $args ); |
@@ -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 | } |
@@ -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 | } |
@@ -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 | |