aristath /
kirki
@@ -118,9 +118,9 @@ |
||
| 118 | 118 | // If we have a variable_callback defined then get the value of the option |
| 119 | 119 | // and run it through the callback function. |
| 120 | 120 | // If no callback is defined (false) then just get the value. |
| 121 | - $variables[ $variable_name ] = Kirki_Values::get_value( $field['settings'] ); |
|
| 121 | + $variables[$variable_name] = Kirki_Values::get_value( $field['settings'] ); |
|
| 122 | 122 | if ( $variable_callback ) { |
| 123 | - $variables[ $variable_name ] = call_user_func( $field_variable['callback'], Kirki_Values::get_value( $field['settings'] ) ); |
|
| 123 | + $variables[$variable_name] = call_user_func( $field_variable['callback'], Kirki_Values::get_value( $field['settings'] ) ); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | } |
@@ -40,8 +40,8 @@ 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. |
@@ -83,43 +83,43 @@ discard block |
||
| 83 | 83 | $config_id = ( '' === $config_id ) ? 'global' : $config_id; |
| 84 | 84 | |
| 85 | 85 | // Fallback to 'global' if $config_id is not found. |
| 86 | - if ( ! isset( Kirki::$config[ $config_id ] ) ) { |
|
| 86 | + if ( ! isset( Kirki::$config[$config_id] ) ) { |
|
| 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'] : ''; |
|
| 116 | - $value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value; |
|
| 115 | + $default_value = ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['default'] ) ) ? Kirki::$fields[$field_id]['default'] : ''; |
|
| 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(). |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) { |
| 145 | 145 | $all_values = get_option( $field['option_name'], array() ); |
| 146 | 146 | $sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] ); |
| 147 | - if ( isset( $all_values[ $sub_setting_id ] ) ) { |
|
| 148 | - $value = $all_values[ $sub_setting_id ]; |
|
| 147 | + if ( isset( $all_values[$sub_setting_id] ) ) { |
|
| 148 | + $value = $all_values[$sub_setting_id]; |
|
| 149 | 149 | } |
| 150 | 150 | } else { |
| 151 | 151 | $value = get_option( $field['settings'], $field['default'] ); |
