WordPress 4.3

[autoinstalls/wordpress.git] / wp-includes / ms-load.php

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index bc925baaa9b465676eaf89a75ce1f42af4212d99..e067193f46c5389f0aa16f1d9d827fd8cdfcd3b0 100644 (file)
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -19,10 +19,7 @@ function is_subdomain_install() {
        if ( defined('SUBDOMAIN_INSTALL') )
                return SUBDOMAIN_INSTALL;
 
-       if ( defined('VHOST') && VHOST == 'yes' )
-               return true;
-
-       return false;
+       return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
 
 /**
@@ -68,7 +65,7 @@ function wp_get_active_network_plugins() {
  *
  * @since 3.0.0
  *
- * @return bool|string Returns true on success, or drop-in file to include.
+ * @return true|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
        $blog = get_blog_details();
@@ -117,10 +114,12 @@ function ms_site_check() {
  *
  * @since 3.9.0
  *
+ * @global wpdb $wpdb
+ *
  * @param string   $domain   Domain to check.
  * @param string   $path     Path to check.
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
- * @return object|bool Network object if successful. False when no network is found.
+ * @return object|false Network object if successful. False when no network is found.
  */
 function get_network_by_path( $domain, $path, $segments = null ) {
        global $wpdb;
@@ -260,8 +259,10 @@ function get_network_by_path( $domain, $path, $segments = null ) {
  *
  * @since 3.9.0
  *
+ * @global wpdb $wpdb
+ *
  * @param object|int $network The network's database row or ID.
- * @return object|bool Object containing network information if found, false if not.
+ * @return object|false Object containing network information if found, false if not.
  */
 function wp_get_network( $network ) {
        global $wpdb;
@@ -281,10 +282,12 @@ function wp_get_network( $network ) {
  *
  * @since 3.9.0
  *
+ * @global wpdb $wpdb
+ *
  * @param string   $domain   Domain to check.
  * @param string   $path     Path to check.
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
- * @return object|bool Site object if successful. False when no site is found.
+ * @return object|false Site object if successful. False when no site is found.
  */
 function get_site_by_path( $domain, $path, $segments = null ) {
        global $wpdb;
@@ -391,6 +394,10 @@ function get_site_by_path( $domain, $path, $segments = null ) {
  *
  * @access private
  * @since 3.0.0
+ *
+ * @global wpdb   $wpdb
+ * @global string $domain
+ * @global string $path
  */
 function ms_not_installed() {
        global $wpdb, $domain, $path;
@@ -463,6 +470,8 @@ function get_current_site_name( $current_site ) {
  * @since 3.0.0
  * @deprecated 3.9.0
  *
+ * @global object $current_site
+ *
  * @return object
  */
 function wpmu_current_site() {