Changeset 40102 for trunk/src/wp-includes/class-wp-network.php

Timestamp:

02/22/2017 10:41:20 AM (6 years ago)

Author:

flixos90

Message:

Multisite: Use WP_Network_Query in WP_Network::get_by_path().

An additional unit test has been introduced to verify the method works properly when using an external object cache.

Props spacedmonkey, jeremyfelt.
Fixes #37217.

File:

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

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

@@ -268 +268 @@
      */
     public static function get_by_path( $domain = '', $path = '', $segments = null ) {
-        global $wpdb;
-
         $domains = array( $domain );
         $pieces  = explode( '.', $domain );
@@ -296 +294 @@
             $using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
             if ( false === $using_paths ) {
-                $using_paths = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} WHERE path <> '/' LIMIT 1" );
+                $using_paths = get_networks( array(
+                    'number'       => 1,
+                    'count'        => true,
+                    'path__not_in' => '/',
+                ) );
                 wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
             }
@@ -354 +356 @@
         }
 
-        // @todo Consider additional optimization routes, perhaps as an opt-in for plugins.
-        // We already have paths covered. What about how far domains should be drilled down (including www)?
-
-        $search_domains = "'" . implode( "', '", $wpdb->_escape( $domains ) ) . "'";
-
         if ( ! $using_paths ) {
-            $network = $wpdb->get_row( "
-                SELECT * FROM {$wpdb->site}
-                WHERE domain IN ({$search_domains})
-                ORDER BY CHAR_LENGTH(domain)
-                DESC LIMIT 1
-            " );
-
-            if ( ! empty( $network ) && ! is_wp_error( $network ) ) {
-                return new WP_Network( $network );
+            $networks = get_networks( array(
+                'number'     => 1,
+                'orderby'    => array(
+                    'domain_length' => 'DESC',
+                ),
+                'domain__in' => $domains,
+            ) );
+
+            if ( ! empty( $networks ) ) {
+                return array_shift( $networks );
             }
 
             return false;
-
-        } else {
-            $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
-            $networks = $wpdb->get_results( "
-                SELECT * FROM {$wpdb->site}
-                WHERE domain IN ({$search_domains})
-                AND path IN ({$search_paths})
-                ORDER BY CHAR_LENGTH(domain) DESC, CHAR_LENGTH(path) DESC
-            " );
-        }
+        }
+
+        $networks = get_networks( array(
+            'orderby'    => array(
+                'domain_length' => 'DESC',
+                'path_length'   => 'DESC',
+            ),
+            'domain__in' => $domains,
+            'path__in'   => $paths,
+        ) );
 
         /*
@@ -403 +401 @@
 
         if ( true === $found ) {
-            return new WP_Network( $network );
+            return $network;
         }