Index: src/wp-includes/class-wp-network.php =================================================================== --- src/wp-includes/class-wp-network.php (revision 37896) +++ src/wp-includes/class-wp-network.php (working copy) @@ -265,144 +265,7 @@ * @return WP_Network|bool Network object if successful. False when no network is found. */ public static function get_by_path( $domain = '', $path = '', $segments = null ) { - global $wpdb; - - $domains = array( $domain ); - $pieces = explode( '.', $domain ); - - /* - * It's possible one domain to search is 'com', but it might as well - * be 'localhost' or some other locally mapped domain. - */ - while ( array_shift( $pieces ) ) { - if ( ! empty( $pieces ) ) { - $domains[] = implode( '.', $pieces ); - } - } - - /* - * If we've gotten to this function during normal execution, there is - * more than one network installed. At this point, who knows how many - * we have. Attempt to optimize for the situation where networks are - * only domains, thus meaning paths never need to be considered. - * - * This is a very basic optimization; anything further could have - * drawbacks depending on the setup, so this is best done per-install. - */ - $using_paths = true; - if ( wp_using_ext_object_cache() ) { - $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" ); - wp_cache_add( 'networks_have_paths', $using_paths, 'site-options' ); - } - } - - $paths = array(); - if ( $using_paths ) { - $path_segments = array_filter( explode( '/', trim( $path, '/' ) ) ); - - /** - * Filters the number of path segments to consider when searching for a site. - * - * @since 3.9.0 - * - * @param int|null $segments The number of path segments to consider. WordPress by default looks at - * one path segment. The function default of null only makes sense when you - * know the requested path should match a network. - * @param string $domain The requested domain. - * @param string $path The requested path, in full. - */ - $segments = apply_filters( 'network_by_path_segments_count', $segments, $domain, $path ); - - if ( ( null !== $segments ) && count( $path_segments ) > $segments ) { - $path_segments = array_slice( $path_segments, 0, $segments ); - } - - while ( count( $path_segments ) ) { - $paths[] = '/' . implode( '/', $path_segments ) . '/'; - array_pop( $path_segments ); - } - - $paths[] = '/'; - } - - /** - * Determine a network by its domain and path. - * - * This allows one to short-circuit the default logic, perhaps by - * replacing it with a routine that is more optimal for your setup. - * - * Return null to avoid the short-circuit. Return false if no network - * can be found at the requested domain and path. Otherwise, return - * an object from wp_get_network(). - * - * @since 3.9.0 - * - * @param null|bool|object $network Network value to return by path. - * @param string $domain The requested domain. - * @param string $path The requested path, in full. - * @param int|null $segments The suggested number of paths to consult. - * Default null, meaning the entire path was to be consulted. - * @param array $paths The paths to search for, based on $path and $segments. - */ - $pre = apply_filters( 'pre_get_network_by_path', null, $domain, $path, $segments, $paths ); - if ( null !== $pre ) { - return $pre; - } - - // @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 ); - } - - 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 - " ); - } - - /* - * Domains are sorted by length of domain, then by length of path. - * The domain must match for the path to be considered. Otherwise, - * a network with the path of / will suffice. - */ - $found = false; - foreach ( $networks as $network ) { - if ( ( $network->domain === $domain ) || ( "www.{$network->domain}" === $domain ) ) { - if ( in_array( $network->path, $paths, true ) ) { - $found = true; - break; - } - } - if ( $network->path === '/' ) { - $found = true; - break; - } - } - - if ( true === $found ) { - return new WP_Network( $network ); - } - - return false; + _deprecated_function( __METHOD__, '4.7.0', 'get_network_by_path()' ); + return get_network_by_path( $domain, $path, $segments ); } } Index: src/wp-includes/ms-load.php =================================================================== --- src/wp-includes/ms-load.php (revision 37896) +++ src/wp-includes/ms-load.php (working copy) @@ -129,7 +129,133 @@ * @return WP_Network|false Network object if successful. False when no network is found. */ function get_network_by_path( $domain, $path, $segments = null ) { - return WP_Network::get_by_path( $domain, $path, $segments ); + + $domains = array( $domain ); + $pieces = explode( '.', $domain ); + + /* + * It's possible one domain to search is 'com', but it might as well + * be 'localhost' or some other locally mapped domain. + */ + while ( array_shift( $pieces ) ) { + if ( ! empty( $pieces ) ) { + $domains[] = implode( '.', $pieces ); + } + } + + /* + * If we've gotten to this function during normal execution, there is + * more than one network installed. At this point, who knows how many + * we have. Attempt to optimize for the situation where networks are + * only domains, thus meaning paths never need to be considered. + * + * This is a very basic optimization; anything further could have + * drawbacks depending on the setup, so this is best done per-install. + */ + $using_paths = true; + if ( wp_using_ext_object_cache() ) { + $using_paths = get_networks( array( 'fields' => 'count', 'path__not_in' => '/') ); + } + + $paths = array(); + if ( $using_paths ) { + $path_segments = array_filter( explode( '/', trim( $path, '/' ) ) ); + + /** + * Filters the number of path segments to consider when searching for a site. + * + * @since 3.9.0 + * + * @param int|null $segments The number of path segments to consider. WordPress by default looks at + * one path segment. The function default of null only makes sense when you + * know the requested path should match a network. + * @param string $domain The requested domain. + * @param string $path The requested path, in full. + */ + $segments = apply_filters( 'network_by_path_segments_count', $segments, $domain, $path ); + + if ( ( null !== $segments ) && count( $path_segments ) > $segments ) { + $path_segments = array_slice( $path_segments, 0, $segments ); + } + + while ( count( $path_segments ) ) { + $paths[] = '/' . implode( '/', $path_segments ) . '/'; + array_pop( $path_segments ); + } + + $paths[] = '/'; + } + + /** + * Determine a network by its domain and path. + * + * This allows one to short-circuit the default logic, perhaps by + * replacing it with a routine that is more optimal for your setup. + * + * Return null to avoid the short-circuit. Return false if no network + * can be found at the requested domain and path. Otherwise, return + * an object from wp_get_network(). + * + * @since 3.9.0 + * + * @param null|bool|object $network Network value to return by path. + * @param string $domain The requested domain. + * @param string $path The requested path, in full. + * @param int|null $segments The suggested number of paths to consult. + * Default null, meaning the entire path was to be consulted. + * @param array $paths The paths to search for, based on $path and $segments. + */ + $pre = apply_filters( 'pre_get_network_by_path', null, $domain, $path, $segments, $paths ); + if ( null !== $pre ) { + return $pre; + } + + // @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)? + + if ( ! $using_paths ) { + + $networks = get_networks( array( 'number' => 1, 'domain__in' => $domains, 'orderby' => 'domain_length' ) ); + + if ( ! empty( $networks ) ) { + return array_shift( $networks ); + } + + return false; + + } else { + $networks = get_networks( array( + 'domain__in' => $domains, + 'path__in' => $paths, + 'orderby' => array( 'domain_length' => 'DESC', 'path_length' => 'DESC' ) + ) + ); + } + + /* + * Domains are sorted by length of domain, then by length of path. + * The domain must match for the path to be considered. Otherwise, + * a network with the path of / will suffice. + */ + $found = false; + foreach ( $networks as $network ) { + if ( ( $network->domain === $domain ) || ( "www.{$network->domain}" === $domain ) ) { + if ( in_array( $network->path, $paths, true ) ) { + $found = true; + break; + } + } + if ( $network->path === '/' ) { + $found = true; + break; + } + } + + if ( true === $found ) { + return $network; + } + + return false; } /** @@ -336,7 +462,7 @@ } if ( empty( $current_site ) ) { - $current_site = WP_Network::get_by_path( $domain, $path, 1 ); + $current_site = get_network_by_path( $domain, $path, 1 ); } if ( empty( $current_site ) ) { @@ -367,7 +493,7 @@ $current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 ); } else { // If you don't have a site with the same domain/path as a network, you're pretty screwed, but: - $current_site = WP_Network::get_by_path( $domain, $path, 1 ); + $current_site = get_network_by_path( $domain, $path, 1 ); } }