Changeset 39100 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

11/02/2016 11:59:28 PM (9 years ago)

Author:

westonruter

Message:

Customize: Prevent PHP warning in applying widget starter content on fresh installs.

Fixes PHP warning triggered by calling max() on $widget_numbers when there are no widget instances of the type yet. Also makes sure that widget instances start at 2 instead of 1.

See #38114.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -929 +929 @@
                     // Find the max widget number for this type.
                     $widget_numbers = array_keys( $settings );
-                    $widget_numbers[] = 1;
-                    $max_widget_numbers[ $id_base ] = call_user_func_array( 'max', $widget_numbers );
+                    if ( count( $widget_numbers ) > 0 ) {
+                        $widget_numbers[] = 1;
+                        $max_widget_numbers[ $id_base ] = call_user_func_array( 'max', $widget_numbers );
+                    } else {
+                        $max_widget_numbers[ $id_base ] = 1;
+                    }
                 }
                 $max_widget_numbers[ $id_base ] += 1;