| @@ -195,7 +195,6 @@ | ||
| 195 | 195 | * | 
| 196 | 196 | * @access protected | 
| 197 | 197 | * @since 3.0.0 | 
| 198 | - * @param string|false $id The string-ID. | |
| 199 | 198 | * @return string | 
| 200 | 199 | */ | 
| 201 | 200 |  	protected function l10n() { | 
| @@ -102,8 +102,8 @@ discard block | ||
| 102 | 102 |  				if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { | 
| 103 | 103 | $option_type = 'theme_mod'; | 
| 104 | 104 | $option_name = false; | 
| 105 | -					if ( isset( Kirki::$config[ $this->config_id ] ) ) { | |
| 106 | - $config = Kirki::$config[ $this->config_id ]; | |
| 105 | +					if ( isset( Kirki::$config[$this->config_id] ) ) { | |
| 106 | + $config = Kirki::$config[$this->config_id]; | |
| 107 | 107 | $option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod'; | 
| 108 | 108 |  						if ( 'option' === $option_type || 'site_option' === $option_type ) { | 
| 109 | 109 | $option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false; | 
| @@ -119,16 +119,16 @@ discard block | ||
| 119 | 119 |  								if ( is_array( $options ) ) { | 
| 120 | 120 |  									if ( $option_name ) { | 
| 121 | 121 | $subkey = str_replace( array( $option_name, '[', ']' ), '', $replace ); | 
| 122 | - $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : ''; | |
| 122 | + $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : ''; | |
| 123 | 123 | break; | 
| 124 | 124 | } | 
| 125 | - $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : ''; | |
| 125 | + $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : ''; | |
| 126 | 126 | break; | 
| 127 | 127 | } | 
| 128 | 128 | $replacement = get_option( $replace ); | 
| 129 | 129 | break; | 
| 130 | 130 | case 'site_option': | 
| 131 | - $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); | |
| 131 | + $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); | |
| 132 | 132 | break; | 
| 133 | 133 | case 'user_meta': | 
| 134 | 134 | $user_id = get_current_user_id(); | 
| @@ -222,9 +222,9 @@ discard block | ||
| 222 | 222 | return; | 
| 223 | 223 | } | 
| 224 | 224 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; | 
| 225 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; | |
| 226 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; | |
| 227 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; | |
| 225 | + $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; | |
| 226 | + $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; | |
| 227 | + $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; | |
| 228 | 228 | |
| 229 | 229 | // Properties that can accept multiple values. | 
| 230 | 230 | // Useful for example for gradients where all browsers use the "background-image" property | 
| @@ -233,13 +233,13 @@ discard block | ||
| 233 | 233 | 'background-image', | 
| 234 | 234 | ); | 
| 235 | 235 |  		if ( in_array( $output['property'], $accepts_multiple, true ) ) { | 
| 236 | -			if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { | |
| 237 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; | |
| 236 | +			if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { | |
| 237 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; | |
| 238 | 238 | } | 
| 239 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; | |
| 239 | + $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; | |
| 240 | 240 | return; | 
| 241 | 241 | } | 
| 242 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; | |
| 242 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; | |
| 243 | 243 | } | 
| 244 | 244 | |
| 245 | 245 | /** | 
| @@ -259,7 +259,7 @@ discard block | ||
| 259 | 259 | 'background-position' => 'Kirki_Output_Property_Background_Position', | 
| 260 | 260 | ) ); | 
| 261 | 261 |  		if ( array_key_exists( $property, $properties ) ) { | 
| 262 | - $classname = $properties[ $property ]; | |
| 262 | + $classname = $properties[$property]; | |
| 263 | 263 | $obj = new $classname( $property, $value ); | 
| 264 | 264 | return $obj->get_value(); | 
| 265 | 265 | } | 
| @@ -136,15 +136,15 @@ discard block | ||
| 136 | 136 | } | 
| 137 | 137 | |
| 138 | 138 | // Add the requested google-font. | 
| 139 | -			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) { | |
| 140 | - $this->fonts[ $value['font-family'] ] = array(); | |
| 139 | +			if ( ! isset( $this->fonts[$value['font-family']] ) ) { | |
| 140 | + $this->fonts[$value['font-family']] = array(); | |
| 141 | 141 | } | 
| 142 | -			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) { | |
| 143 | - $this->fonts[ $value['font-family'] ][] = $value['variant']; | |
| 142 | +			if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) { | |
| 143 | + $this->fonts[$value['font-family']][] = $value['variant']; | |
| 144 | 144 | } | 
| 145 | 145 |  			if ( ! empty( $args['choices']['variant'] ) ) { | 
| 146 | 146 |  				foreach ( $args['choices']['variant'] as $extra_variant ) { | 
| 147 | - $this->fonts[ $value['font-family'] ][] = $extra_variant; | |
| 147 | + $this->fonts[$value['font-family']][] = $extra_variant; | |
| 148 | 148 | } | 
| 149 | 149 | } | 
| 150 | 150 |  		} else { | 
| @@ -163,12 +163,12 @@ discard block | ||
| 163 | 163 | |
| 164 | 164 |  					if ( 'font-family' === $output['property'] ) { | 
| 165 | 165 |  						if ( ! array_key_exists( $value, $this->fonts ) ) { | 
| 166 | - $this->fonts[ $value ] = array(); | |
| 166 | + $this->fonts[$value] = array(); | |
| 167 | 167 | } | 
| 168 | 168 |  					} elseif ( 'font-weight' === $output['property'] ) { | 
| 169 | 169 |  						foreach ( $this->fonts as $font => $variants ) { | 
| 170 | 170 |  							if ( ! in_array( $value, $variants, true ) ) { | 
| 171 | - $this->fonts[ $font ][] = $value; | |
| 171 | + $this->fonts[$font][] = $value; | |
| 172 | 172 | } | 
| 173 | 173 | } | 
| 174 | 174 |  					} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) { | 
| @@ -207,31 +207,31 @@ discard block | ||
| 207 | 207 | // Determine if this is indeed a google font or not. | 
| 208 | 208 | // If it's not, then just remove it from the array. | 
| 209 | 209 |  			if ( ! array_key_exists( $font, $this->google_fonts ) ) { | 
| 210 | - unset( $this->fonts[ $font ] ); | |
| 210 | + unset( $this->fonts[$font] ); | |
| 211 | 211 | continue; | 
| 212 | 212 | } | 
| 213 | 213 | |
| 214 | 214 | // Get all valid font variants for this font. | 
| 215 | 215 | $font_variants = array(); | 
| 216 | -			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) { | |
| 217 | - $font_variants = $this->google_fonts[ $font ]['variants']; | |
| 216 | +			if ( isset( $this->google_fonts[$font]['variants'] ) ) { | |
| 217 | + $font_variants = $this->google_fonts[$font]['variants']; | |
| 218 | 218 | } | 
| 219 | 219 |  			foreach ( $variants as $variant ) { | 
| 220 | 220 | |
| 221 | 221 | // If this is not a valid variant for this font-family | 
| 222 | 222 | // then unset it and move on to the next one. | 
| 223 | 223 |  				if ( ! in_array( $variant, $font_variants, true ) ) { | 
| 224 | - $variant_key = array_search( $variant, $this->fonts[ $font ], true ); | |
| 225 | - unset( $this->fonts[ $font ][ $variant_key ] ); | |
| 224 | + $variant_key = array_search( $variant, $this->fonts[$font], true ); | |
| 225 | + unset( $this->fonts[$font][$variant_key] ); | |
| 226 | 226 | continue; | 
| 227 | 227 | } | 
| 228 | 228 | } | 
| 229 | 229 | |
| 230 | 230 | // Check if the selected subsets exist, even in one of the selected fonts. | 
| 231 | 231 | // If they don't, then they have to be removed otherwise the link will fail. | 
| 232 | -			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) { | |
| 232 | +			if ( isset( $this->google_fonts[$font]['subsets'] ) ) { | |
| 233 | 233 |  				foreach ( $this->subsets as $subset ) { | 
| 234 | -					if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) { | |
| 234 | +					if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) { | |
| 235 | 235 | $valid_subsets[] = $subset; | 
| 236 | 236 | } | 
| 237 | 237 | } |