Ticket #52728: 52728.diff

src/wp-includes/class-wp-widget.php

@@ -237 +237 @@
          * @since 2.8.0
          */
         public function _register() {
-                $settings = $this->get_settings();
+                $settings = $this->get_settings_array();
                 $empty    = true;
 
-                // When $settings is an array-like object, get an intrinsic array for use with array_keys().
-                if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
-                        $settings = $settings->getArrayCopy();
-                }
-
                 if ( is_array( $settings ) ) {
                         foreach ( array_keys( $settings ) as $number ) {
                                 if ( is_numeric( $number ) ) {
@@ -350 +345 @@
 
                 $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
                 $this->_set( $widget_args['number'] );
-                $instances = $this->get_settings();
+                $instances = $this->get_settings_array();
 
                 if ( array_key_exists( $this->number, $instances ) ) {
                         $instance = $instances[ $this->number ];
@@ -570 +565 @@
          *
          * @since 2.8.0
          *
-         * @return array Multi-dimensional array of widget instance settings.
+         * @return array|ArrayObject|ArrayIterator Multi-dimensional array of widget instance settings.
+         *                                         Customized widget storage implementations may also
+         *                                         return ArrayObject or ArrayIterators instances.
          */
         public function get_settings() {
 
@@ -597 +594 @@
                 unset( $settings['_multiwidget'], $settings['__i__'] );
                 return $settings;
         }
+
+        /**
+         * Retrieves the settings for all instances as an array.
+         *
+         * @since 5.x.y
+         *
+         * @return array Array of widget instance settings.
+         */
+        private function get_settings_array() {
+                $settings = $this->get_settings();
+
+                if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
+                        $settings = $settings->getArrayCopy();
+                }
+
+                if ( ! is_array( $settings ) ) {
+                        $settings = array();
+                }
+
+                return $settings;
+        }
 }