WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Doc fixes for wp_get_network(). 

props TobiasBg.
see #27003.

Built from https://develop.svn.wordpress.org/trunk@27381


git-svn-id: http://core.svn.wordpress.org/trunk@27230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-03-03 18:56:14 +00:00
parent f1bcaeb35f
commit 0523624d31
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/ms-load.php
View File

@ -280,8 +280,8 @@ function get_network_by_path( $domain, $path, $segments = null ) {
* *
* @since 3.9.0 * @since 3.9.0
* *
* @param int $network_id The network's DB row or ID. * @param object|int $network The network's DB row or ID.
* @return mixed Object containing network information if found, false if not. * @return object|bool Object containing network information if found, false if not.
*/ */
function wp_get_network( $network ) { function wp_get_network( $network ) {
global $wpdb; global $wpdb;
@ -315,14 +315,13 @@ function wpmu_current_site() {
function get_site_by_path( $domain, $path, $segments = null ) { function get_site_by_path( $domain, $path, $segments = null ) {
global $wpdb; global $wpdb;
$path_segments = array_filter( explode( '/', trim( $path, "/" ) ) ); $path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
/** /**
* Filter the number of path segments to consider when searching for a site. * Filter the number of path segments to consider when searching for a site.
* *
* @since 3.9.0 * @since 3.9.0
* *
* @param mixed $segments The number of path segments to consider. WordPress by default looks at * @param mixed $segments The number of path segments to consider. WordPress by default looks at
* one path segment following the network path. The function default of * one path segment following the network path. The function default of
* null only makes sense when you know the requested path should match a site. * null only makes sense when you know the requested path should match a site.
@ -331,7 +330,7 @@ function get_site_by_path( $domain, $path, $segments = null ) {
*/ */
$segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path ); $segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path );
if ( null !== $segments && count($path_segments ) > $segments ) { if ( null !== $segments && count( $path_segments ) > $segments ) {
$path_segments = array_slice( $path_segments, 0, $segments ); $path_segments = array_slice( $path_segments, 0, $segments );
} }