Changeset 32943

Timestamp:

06/25/2015 07:00:51 PM (9 years ago)

Author:

wonderboymusic

Message:

In get_site_option() and get_option(), ensure that $notoptions is an array before writing to it. Prevents a flood of Cannot use a scalar value as an array, because $notoptions is otherwise set to the result of wp_cache_get(), which returns mixed.

Props hauvong.
Fixes #31147.

File:

• trunk/src/wp-includes/option.php (modified) (2 diffs)

trunk/src/wp-includes/option.php

@@ -84 +84 @@
                     wp_cache_add( $option, $value, 'options' );
                 } else { // option does not exist, so we must cache its non-existence
+                    if ( ! is_array( $notoptions ) ) {
+                         $notoptions = array();
+                    }
                     $notoptions[$option] = true;
                     wp_cache_set( 'notoptions', $notoptions, 'options' );
@@ -1025 +1028 @@
                 wp_cache_set( $cache_key, $value, 'site-options' );
             } else {
+                if ( ! is_array( $notoptions ) ) {
+                     $notoptions = array();
+                }
                 $notoptions[$option] = true;
                 wp_cache_set( $notoptions_key, $notoptions, 'site-options' );