Changeset 35100

Timestamp:

10/13/2015 01:12:12 AM (9 years ago)

Author:

wonderboymusic

Message:

Widgets: when getting settings, and none exist, set them to empty to avoid extraneous database queries on subsequent requests.

Adds unit tests.

Props kovshenin, MikeHansenMe, dlh.
Fixes #26876.

Location:

trunk

Files:

• src/wp-includes/class-wp-widget.php (modified) (1 diff)
• tests/phpunit/tests/widgets.php (modified) (2 diffs)

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

@@ -540 +540 @@
         $settings = get_option( $this->option_name );
 
-        if ( false === $settings && isset( $this->alt_option_name ) ) {
-            $settings = get_option( $this->alt_option_name );
+        if ( false === $settings ) {
+            if ( isset( $this->alt_option_name ) ) {
+                $settings = get_option( $this->alt_option_name );
+            } else {
+                // Save an option so it can be autoloaded next time.
+                $this->save_settings( array() );
+            }
         }
 

trunk/tests/phpunit/tests/widgets.php

@@ -466 +466 @@
         unset( $option_value['_multiwidget'] );
 
+        // Pretend this widget is new.
+        delete_option( 'widget_nav_menu' );
+        $never_used = get_option( 'widget_nav_menu' );
+        $this->assertFalse( $never_used );
+
         wp_widgets_init();
         $wp_widget_search = $wp_registered_widgets['search-2']['callback'][0];
@@ -476 +481 @@
             $this->assertEquals( $settings[ $widget_number ], $option_value[ $widget_number ] );
         }
+
+        // After widgets_init(), get_settings() should create the widget option.
+        $never_used = get_option( 'widget_nav_menu' );
+        $this->assertEquals( 1, $never_used['_multiwidget'] );
+        $this->assertArrayNotHasKey( 0, $never_used );
     }