Customizer: fixes merge conflicts

Automattic · Jun 13, 2018 · d787932 · d787932
1 parent d9fd020
commit d787932
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/widgets/simple-payments.php b/modules/widgets/simple-payments.php
@@ -243,7 +243,12 @@ function widget( $args, $instance ) {
 				}
 
 				$jsp = Jetpack_Simple_Payments::getInstance();
-				echo $jsp->parse_shortcode( $attrs );
+				$simple_payments_button = $jsp->parse_shortcode( $attrs );
+				if ( is_null( $simple_payments_button ) && ! is_customize_preview() ) {
+					return;
+				}
+
+				echo $simple_payments_button;
 			}
 
 			echo '</div><!--simple-payments-->';