Merge pull request #964 from siteorigin/sidebar-emulator-account-for-potential-notice

Misplon · web-flow · commit 36bef7fae3cc · 2022-01-26T14:43:04.000+02:00
Sidebar Emulator: Account for potential notice when setting widget id
diff --git a/inc/sidebars-emulator.php b/inc/sidebars-emulator.php
@@ -50,7 +50,9 @@ function __call( $name, $args ) {
 						if ( $instance_class == $widget_class && ! empty( $sidebar_id ) ) {
 							//The option value uses only the widget id number as keys
 							preg_match( '/-([0-9]+$)/', $sidebar_id, $num_match );
-							$args[0][ $num_match[1] ] = $widget_instance;
+							if ( ! empty( $num_match ) ) {
+								$args[0][ $num_match[1] ] = $widget_instance;
+							}
 						}
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ function __call( $name, $args ) {`
`50`	`50`	`if ( $instance_class == $widget_class && ! empty( $sidebar_id ) ) {`
`51`	`51`	`//The option value uses only the widget id number as keys`
`52`	`52`	`preg_match( '/-([0-9]+$)/', $sidebar_id, $num_match );`
`53`		`- $args[0][ $num_match[1] ] = $widget_instance;`
	`53`	`+ if ( ! empty( $num_match ) ) {`
	`54`	`+ $args[0][ $num_match[1] ] = $widget_instance;`
	`55`	`+ }`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`