Fix warning on activating new themes. Fixes #48

xwp · Dec 8, 2013 · 32b7833 · 32b7833
1 parent 648ee36
commit 32b7833
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/connectors/menus.php b/connectors/menus.php
@@ -129,6 +129,10 @@ public static function callback_delete_nav_menu( $term, $tt_id, $deleted_term )
 	public static function callback_update_option_theme_mods( $old, $new )
 	{
 		$key = 'nav_menu_locations';
+		if ( ! isset( $new[$key] ) ) {
+			return; // Switching themes ?
+		}
+
 		if ( $old[$key] === $new[$key] ) {
 			return;
 		}

diff --git a/connectors/widgets.php b/connectors/widgets.php
@@ -105,6 +105,9 @@ public static function callback_update_option_sidebars_widgets( $old, $new ) {
 
 		if ( ! $widget_id ) {
 			foreach ( $new as $sidebar_id => $new_widgets ){
+				if ( ! is_array( $old[$sidebar_id] ) || ! is_array( $new_widgets ) ) {
+					return; // Switching themes ?
+				}
 				$old_widgets = $old[$sidebar_id];
 
 				// Added ?