Completed
Pull Request — master (#2466)
by
unknown
45s
created
classes/models/FrmSolution.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Only do this for single site installs.
45
-		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
45
+		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) {
46
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
46 47
 			return;
47 48
 		}
48 49
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	 */
184 184
 	public function add_settings( $sections ) {
185 185
 		wp_enqueue_style( 'formidable-pro-fields' );
186
-		$sections[ $this->plugin_slug ] = array(
186
+		$sections[$this->plugin_slug] = array(
187 187
 			'class'    => $this,
188 188
 			'function' => 'settings_page',
189 189
 			'name'     => $this->plugin_name(),
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
 			// Set the current step.
350 350
 			if ( ! isset( $step['current'] ) ) {
351 351
 				if ( $step['complete'] ) {
352
-					$steps[ $k ]['current'] = false;
352
+					$steps[$k]['current'] = false;
353 353
 				} else {
354
-					$steps[ $k ]['current'] = ! $has_current;
354
+					$steps[$k]['current'] = ! $has_current;
355 355
 					$has_current            = true;
356 356
 				}
357 357
 			} elseif ( $step['current'] ) {
@@ -361,10 +361,10 @@  discard block
 block discarded – undo
361 361
 			// Set disabled buttons.
362 362
 			$class  = isset( $step['button_class'] ) ? $step['button_class'] : '';
363 363
 			$class .= ' button-primary frm-button-primary';
364
-			if ( ! $steps[ $k ]['current'] ) {
364
+			if ( ! $steps[$k]['current'] ) {
365 365
 				$class .= ' frm_grey disabled';
366 366
 			}
367
-			$steps[ $k ]['button_class'] = $class;
367
+			$steps[$k]['button_class'] = $class;
368 368
 		}//end foreach
369 369
 
370 370
 		return $steps;
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 		$addons = $api->get_api_info();
520 520
 
521 521
 		$id       = $this->download_id();
522
-		$has_file = isset( $addons[ $id ] ) && isset( $addons[ $id ]['beta'] );
522
+		$has_file = isset( $addons[$id] ) && isset( $addons[$id]['beta'] );
523 523
 
524 524
 		if ( ! $step['current'] ) {
525 525
 			?>
@@ -534,10 +534,10 @@  discard block
 block discarded – undo
534 534
 
535 535
 		if ( ! $has_file ) {
536 536
 			echo '<p class="frm_error_style">' . esc_html__( 'We didn\'t find anything to import. Please contact our team.', 'formidable' ) . '</p>';
537
-		} elseif ( ! isset( $addons[ $id ]['beta']['package'] ) ) {
537
+		} elseif ( ! isset( $addons[$id]['beta']['package'] ) ) {
538 538
 			echo '<p class="frm_error_style">' . esc_html__( 'Looks like you may not have a current subscription for this solution. Please check your account.', 'formidable' ) . '</p>';
539 539
 		} else {
540
-			$xml = $addons[ $id ]['beta']['package'];
540
+			$xml = $addons[$id]['beta']['package'];
541 541
 			if ( is_array( $xml ) ) {
542 542
 				$xml = reset( $xml );
543 543
 			}
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		foreach ( $options as $info ) {
615 615
 			// Count the number of options displayed for css.
616 616
 			if ( $count > 1 && ! isset( $info['img'] ) ) {
617
-				--$count;
617
+				-- $count;
618 618
 			}
619 619
 		}
620 620
 		$width = floor( ( 533 - ( ( $count - 1 ) * 20 ) ) / $count );
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		foreach ( $forms as $form ) {
705 705
 			$was_imported = isset( $form['form'] ) ? FrmForm::get_id_by_key( $form['form'] ) : false;
706 706
 			if ( $was_imported ) {
707
-				$imported[ $form['form'] ] = $was_imported;
707
+				$imported[$form['form']] = $was_imported;
708 708
 			}
709 709
 		}
710 710
 
Please login to merge, or discard this patch.
classes/views/frm-forms/landing-page-preview-option.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 $data_keys = array_keys( $data );
7 7
 $params    = array();
8 8
 foreach ( $data_keys as $key ) {
9
-	$params[ 'data-' . $key ] = $data[ $key ];
9
+	$params['data-' . $key] = $data[$key];
10 10
 }
11 11
 $params['class'] = 'frm_show_upgrade frm_noallow';
12 12
 $params['href']  = '#';
Please login to merge, or discard this patch.
classes/models/FrmStyle.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,8 @@
 block discarded – undo
67 67
 			$new_instance = (array) $new_instance;
68 68
 			$this->id     = $new_instance['ID'];
69 69
 
70
-			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
70
+			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
71
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
71 72
 				// Don't continue if not saving this style.
72 73
 				continue;
73 74
 			}
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -102,21 +102,21 @@  discard block
 block discarded – undo
102 102
 			$default_settings = $this->get_defaults();
103 103
 
104 104
 			foreach ( $default_settings as $setting => $default ) {
105
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
106
-					$new_instance['post_content'][ $setting ] = $default;
105
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
106
+					$new_instance['post_content'][$setting] = $default;
107 107
 				}
108 108
 
109 109
 				if ( $this->is_color( $setting ) ) {
110
-					$color_val = $new_instance['post_content'][ $setting ];
110
+					$color_val = $new_instance['post_content'][$setting];
111 111
 					if ( $color_val !== '' && false !== strpos( $color_val, 'rgb' ) ) {
112 112
 						// Maybe sanitize if invalid rgba value is entered.
113 113
 						$this->maybe_sanitize_rgba_value( $color_val );
114 114
 					}
115
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $color_val );
116
-				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
117
-					$new_instance['post_content'][ $setting ] = 0;
115
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $color_val );
116
+				} elseif ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ), true ) && ! isset( $new_instance['post_content'][$setting] ) ) {
117
+					$new_instance['post_content'][$setting] = 0;
118 118
 				} elseif ( $setting === 'font' ) {
119
-					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
119
+					$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
120 120
 				}
121 121
 			}
122 122
 
@@ -236,14 +236,14 @@  discard block
 block discarded – undo
236 236
 		$valid_keys         = array_keys( $defaults );
237 237
 		$sanitized_settings = array();
238 238
 		foreach ( $valid_keys as $key ) {
239
-			if ( isset( $settings[ $key ] ) ) {
240
-				$sanitized_settings[ $key ] = sanitize_textarea_field( $settings[ $key ] );
239
+			if ( isset( $settings[$key] ) ) {
240
+				$sanitized_settings[$key] = sanitize_textarea_field( $settings[$key] );
241 241
 			} else {
242
-				$sanitized_settings[ $key ] = $defaults[ $key ];
242
+				$sanitized_settings[$key] = $defaults[$key];
243 243
 			}
244 244
 			
245 245
 			if ( 'custom_css' !== $key ) {
246
-				$sanitized_settings[ $key ] = $this->strip_invalid_characters( $sanitized_settings[ $key ] );
246
+				$sanitized_settings[$key] = $this->strip_invalid_characters( $sanitized_settings[$key] );
247 247
 			}
248 248
 		}
249 249
 		return $sanitized_settings;
@@ -493,13 +493,13 @@  discard block
 block discarded – undo
493 493
 			$style->post_content = $this->override_defaults( $style->post_content );
494 494
 			$style->post_content = wp_parse_args( $style->post_content, $default_values );
495 495
 
496
-			$styles[ $style->ID ] = $style;
496
+			$styles[$style->ID] = $style;
497 497
 		}
498 498
 
499 499
 		if ( ! $default_style ) {
500 500
 			$default_style = reset( $styles );
501 501
 
502
-			$styles[ $default_style->ID ]->menu_order = 1;
502
+			$styles[$default_style->ID]->menu_order = 1;
503 503
 		}
504 504
 
505 505
 		return $styles;
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 				continue;
744 744
 			}
745 745
 
746
-			if ( $value && $char === $value[ strlen( $value ) - 1 ] ) {
746
+			if ( $value && $char === $value[strlen( $value ) - 1] ) {
747 747
 				$value = $char . $value;
748 748
 			} else {
749 749
 				$value .= $char;
Please login to merge, or discard this patch.
classes/helpers/FrmStylesHelper.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,8 @@
 block discarded – undo
285 285
 	public static function get_settings_for_output( $style ) {
286 286
 		if ( self::previewing_style() ) {
287 287
 			$frm_style = new FrmStyle();
288
-			if ( isset( $_POST['frm_style_setting'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
288
+			if ( isset( $_POST['frm_style_setting'] ) ) {
289
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
289 290
 
290 291
 				// Sanitizing is done later.
291 292
 				$posted = wp_unslash( $_POST['frm_style_setting'] ); //phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 				'-' => 'down',
144 144
 				'+' => 'up',
145 145
 			);
146
-			$class = 'frm_arrow' . $arrow[ $icon ];
146
+			$class = 'frm_arrow' . $arrow[$icon];
147 147
 		} else {
148 148
 			// frm_minus1_icon.
149 149
 			$key   = str_replace( 'p', '', $key );
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 				'-' => 'minus',
152 152
 				'+' => 'plus',
153 153
 			);
154
-			$class = 'frm_' . $plus[ $icon ];
154
+			$class = 'frm_' . $plus[$icon];
155 155
 		}
156 156
 
157 157
 		if ( $key ) {
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 		?>
178 178
 		<div class="btn-group" id="frm_<?php echo esc_attr( $name ); ?>_select">
179 179
 			<button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
180
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ); ?>
181
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ); ?>
180
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '+', $type ) ); ?>
181
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '-', $type ) ); ?>
182 182
 				<b class="caret"></b>
183 183
 			</button>
184 184
 			<ul class="multiselect-container frm-dropdown-menu">
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 					<li <?php echo $style->post_content['collapse_icon'] == $key ? 'class="active"' : ''; ?>>
187 187
 						<a href="javascript:void(0);">
188 188
 							<label>
189
-								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[ $name ], $key ); ?> />
189
+								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[$name], $key ); ?> />
190 190
 								<span>
191 191
 									<?php
192 192
 									FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '+', $type ) );
@@ -437,11 +437,11 @@  discard block
 block discarded – undo
437 437
 		$vars   = array_diff( $vars, $remove );
438 438
 
439 439
 		foreach ( $vars as $var ) {
440
-			if ( ! isset( $settings[ $var ] ) || ! self::css_key_is_valid( $var ) ) {
440
+			if ( ! isset( $settings[$var] ) || ! self::css_key_is_valid( $var ) ) {
441 441
 				continue;
442 442
 			}
443
-			if ( ! isset( $defaults[ $var ] ) ) {
444
-				$defaults[ $var ] = '';
443
+			if ( ! isset( $defaults[$var] ) ) {
444
+				$defaults[$var] = '';
445 445
 			}
446 446
 
447 447
 			$prepared_value = '';
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 			return false;
469 469
 		}
470 470
 
471
-		if ( $defaults && $defaults[ $var ] === $prepared_value ) {
471
+		if ( $defaults && $defaults[$var] === $prepared_value ) {
472 472
 			return false;
473 473
 		}
474 474
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 	 * @return string
550 550
 	 */
551 551
 	private static function css_var_prepare_value( $settings, $key ) {
552
-		$value = $settings[ $key ];
552
+		$value = $settings[$key];
553 553
 
554 554
 		if ( ! is_string( $value ) && ! is_numeric( $value ) ) {
555 555
 			return '';
@@ -634,8 +634,8 @@  discard block
 block discarded – undo
634 634
 
635 635
 		$checkbox_opts = array( 'important_style', 'auto_width', 'submit_style', 'collapse_icon', 'center_form' );
636 636
 		foreach ( $checkbox_opts as $opt ) {
637
-			if ( ! isset( $settings[ $opt ] ) ) {
638
-				$settings[ $opt ] = 0;
637
+			if ( ! isset( $settings[$opt] ) ) {
638
+				$settings[$opt] = 0;
639 639
 			}
640 640
 		}
641 641
 
@@ -683,9 +683,9 @@  discard block
 block discarded – undo
683 683
 		);
684 684
 
685 685
 		array_map(
686
-			function ( $key ) use ( $defaults, $font_size, $base_font_size, &$settings ) {
687
-				if ( isset( $settings[ $key ] ) ) {
688
-					$settings[ $key ] = round( self::get_base_font_size_scale( $key, $font_size, $defaults ) * $base_font_size ) . 'px';
686
+			function( $key ) use ( $defaults, $font_size, $base_font_size, &$settings ) {
687
+				if ( isset( $settings[$key] ) ) {
688
+					$settings[$key] = round( self::get_base_font_size_scale( $key, $font_size, $defaults ) * $base_font_size ) . 'px';
689 689
 				}
690 690
 			},
691 691
 			$font_sizes_to_update
@@ -702,11 +702,11 @@  discard block
 block discarded – undo
702 702
 	 * @return float
703 703
 	 */
704 704
 	private static function get_base_font_size_scale( $key, $value, $defaults ) {
705
-		if ( empty( $defaults[ $key ] ) || ! is_numeric( (int) $defaults[ $key ] ) || ! is_numeric( (int) $value ) || 0 === (int) $value ) {
705
+		if ( empty( $defaults[$key] ) || ! is_numeric( (int) $defaults[$key] ) || ! is_numeric( (int) $value ) || 0 === (int) $value ) {
706 706
 			return 1;
707 707
 		}
708 708
 
709
-		return round( (int) $defaults[ $key ] / (int) $value, 2 );
709
+		return round( (int) $defaults[$key] / (int) $value, 2 );
710 710
 	}
711 711
 
712 712
 	/**
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 				$css = '';
720 720
 			}
721 721
 			foreach ( $opts as $opt ) {
722
-				self::get_color_output( $css, $settings[ $opt ] );
722
+				self::get_color_output( $css, $settings[$opt] );
723 723
 			}
724 724
 		}
725 725
 	}
@@ -932,13 +932,13 @@  discard block
 block discarded – undo
932 932
 	 */
933 933
 	private static function get_default_style_count( $style_id, $conversational_style_id ) {
934 934
 		$substrings = array_map(
935
-			function ( $value ) {
935
+			function( $value ) {
936 936
 				$substring = serialize( array( 'custom_style' => $value ) );
937 937
 				return substr( $substring, 5, -1 );
938 938
 			},
939 939
 			array( '1', 1 )
940 940
 		);
941
-		$where      = array(
941
+		$where = array(
942 942
 			'status' => 'published',
943 943
 			0        => array(
944 944
 				'options NOT LIKE' => 'custom_style',
Please login to merge, or discard this patch.
classes/models/FrmStyleApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 		// Remove 'Styling Template' from titles.
51 51
 		foreach ( $api_info as $id => $template ) {
52 52
 			if ( isset( $template['name'] ) ) {
53
-				$api_info[ $id ]['name'] = preg_replace( '/(\sStyle|Styling)?(\sTemplate)?$/', '', $template['name'] );
53
+				$api_info[$id]['name'] = preg_replace( '/(\sStyle|Styling)?(\sTemplate)?$/', '', $template['name'] );
54 54
 			}
55 55
 		}
56 56
 
Please login to merge, or discard this patch.
classes/views/styles/_style-card.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 				'text-color'      => $style->post_content['text_color'],
41 41
 				'submit-bg-color' => $style->post_content['submit_bg_color'],
42 42
 			);
43
-			$index  = 0;
43
+			$index = 0;
44 44
 			foreach ( $colors as $css_var_name => $color ) {
45 45
 				if ( 0 !== strpos( $color, 'rgb' ) ) {
46 46
 					$color = '#' . $color;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 					'style' => 'background-color: var(--' . $css_var_name . ')',
52 52
 				);
53 53
 
54
-				++$index;
54
+				++ $index;
55 55
 				?>
56 56
 				<div <?php FrmAppHelper::array_to_html_params( $circle_params, true ); ?>></div>
57 57
 				<?php
Please login to merge, or discard this patch.
classes/models/FrmFormApi.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
105 105
 			if ( isset( $addon['categories'] ) ) {
106 106
 				$cats = array_intersect( $this->skip_categories(), $addon['categories'] );
107 107
 				if ( ! empty( $cats ) ) {
108
-					unset( $addons[ $k ] );
108
+					unset( $addons[$k] );
109 109
 					continue;
110 110
 				}
111 111
 			}
112 112
 
113 113
 			if ( ! array_key_exists( 'is_new', $addon ) && array_key_exists( 'released', $addon ) ) {
114
-				$addons[ $k ]['is_new'] = $this->is_new( $addon );
114
+				$addons[$k]['is_new'] = $this->is_new( $addon );
115 115
 			}
116 116
 		}
117 117
 
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 					return $addon;
154 154
 				}
155 155
 			}
156
-		} elseif ( isset( $addons[ $download_id ] ) ) {
157
-			$plugin = $addons[ $download_id ];
156
+		} elseif ( isset( $addons[$download_id] ) ) {
157
+			$plugin = $addons[$download_id];
158 158
 		}
159 159
 
160 160
 		return $plugin;
Please login to merge, or discard this patch.
classes/models/FrmReviews.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 		$show_intervals = array( 50, 200, 500 );
81 81
 		$asked          = $this->review_status['asked'];
82 82
 
83
-		if ( ! isset( $show_intervals[ $asked ] ) ) {
83
+		if ( ! isset( $show_intervals[$asked] ) ) {
84 84
 			return;
85 85
 		}
86 86
 
87 87
 		$entries = FrmEntry::getRecordCount();
88
-		$count   = $show_intervals[ $asked ];
88
+		$count   = $show_intervals[$asked];
89 89
 		$user    = wp_get_current_user();
90 90
 
91 91
 		// Only show review request if the site has collected enough entries
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 		$requests = $message->get_messages();
135 135
 		$key      = $this->inbox_key . ( $asked ? $asked : '' );
136 136
 
137
-		if ( isset( $requests[ $key ] ) ) {
137
+		if ( isset( $requests[$key] ) ) {
138 138
 			return;
139 139
 		}
140 140
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * @return bool
174 174
 	 */
175 175
 	private function has_later_request( $requests, $asked ) {
176
-		return isset( $requests[ $this->inbox_key . ( $asked + 1 ) ] ) || isset( $requests[ $this->inbox_key . ( $asked + 2 ) ] );
176
+		return isset( $requests[$this->inbox_key . ( $asked + 1 )] ) || isset( $requests[$this->inbox_key . ( $asked + 2 )] );
177 177
 	}
178 178
 
179 179
 	/**
Please login to merge, or discard this patch.
classes/models/FrmTableHTMLGenerator.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @return void
87 87
 	 */
88 88
 	private function init_style_settings( $atts ) {
89
-		$style_settings       = array(
89
+		$style_settings = array(
90 90
 			'border_color' => 'dddddd',
91 91
 			'bg_color'     => 'f7f7f7',
92 92
 			'text_color'   => '444444',
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 		$this->style_settings = apply_filters( 'frm_show_entry_styles', $style_settings );
98 98
 
99 99
 		foreach ( $this->style_settings as $key => $setting ) {
100
-			if ( isset( $atts[ $key ] ) && $atts[ $key ] !== '' ) {
101
-				$this->style_settings[ $key ] = $atts[ $key ];
100
+			if ( isset( $atts[$key] ) && $atts[$key] !== '' ) {
101
+				$this->style_settings[$key] = $atts[$key];
102 102
 			}
103 103
 
104 104
 			if ( $this->is_color_setting( $key ) ) {
105
-				$this->style_settings[ $key ] = $this->get_color_markup( $this->style_settings[ $key ] );
105
+				$this->style_settings[$key] = $this->get_color_markup( $this->style_settings[$key] );
106 106
 			}
107 107
 		}
108 108
 
Please login to merge, or discard this patch.