Changeset 35212

Timestamp:

10/15/2015 10:06:38 PM (9 years ago)

Author:

ocean90

Message:

Multisite: Remove the strictness for $using_paths in WP_Network::get_by_path().

The network lookup was broken when using an external object cache because $using_paths isn't always a boolean. Added in [34099].

See #31985, #31491.

File:

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

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

@@ -210 +210 @@
             $using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
             if ( false === $using_paths ) {
-                $using_paths = $wpdb->get_var( "SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1" );
-                wp_cache_add( 'networks_have_paths', (int) $using_paths, 'site-options'  );
+                $using_paths = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1" );
+                wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
             }
         }
 
         $paths = array();
-        if ( true === $using_paths ) {
+        if ( $using_paths ) {
             $path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
 
@@ -273 +273 @@
         $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
 
-        if ( false === $using_paths ) {
+        if ( ! $using_paths ) {
             $network = $wpdb->get_row( "
                 SELECT * FROM {$wpdb->site}