X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..refs/tags/wordpress-4.4:/wp-includes/ms-load.php
diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index a202034b..a1923155 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -19,22 +19,19 @@ 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' );
}
/**
* Returns array of network plugin files to be included in global scope.
*
* The default directory is wp-content/plugins. To change the default directory
- * manually, define WP_PLUGIN_DIR
and WP_PLUGIN_URL
- * in wp-config.php.
+ * manually, define `WP_PLUGIN_DIR` and `WP_PLUGIN_URL` in `wp-config.php`.
*
* @access private
* @since 3.1.0
- * @return array Files to include
+ *
+ * @return array Files to include.
*/
function wp_get_active_network_plugins() {
$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
@@ -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();
@@ -96,10 +93,17 @@ function ms_site_check() {
}
if ( '2' == $blog->deleted ) {
- if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
+ if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
return WP_CONTENT_DIR . '/blog-inactive.php';
- else
- wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %1$s.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
+ } else {
+ $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
+ wp_die(
+ /* translators: %s: admin email link */
+ sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
+ sprintf( '%s', $admin_email )
+ )
+ );
+ }
}
if ( $blog->archived == '1' || $blog->spam == '1' ) {
@@ -113,164 +117,34 @@ function ms_site_check() {
}
/**
- * Retrieve a network object by its domain and path.
+ * Retrieve the closest matching network for a domain and path.
*
* @since 3.9.0
+ * @since 4.4.0 Converted to a wrapper for WP_Network::get_by_path()
*
* @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 WP_Network|false Network object if successful. False when no network is found.
*/
function get_network_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 ( $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 = (bool) $wpdb->get_var( "SELECT id FROM $wpdb->site WHERE path <> '/' LIMIT 1" );
- wp_cache_add( 'networks_have_paths', (int) $using_paths, 'site-options' );
- }
- }
-
- $paths = array();
- if ( $using_paths ) {
- $path_segments = array_filter( explode( '/', trim( $path, "/" ) ) );
-
- /**
- * Filter 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 id, domain, path FROM $wpdb->site
- WHERE domain IN ($search_domains) ORDER BY CHAR_LENGTH(domain) DESC LIMIT 1" );
- if ( $network ) {
- return wp_get_network( $network );
- }
- return false;
-
- } else {
- $search_paths = "'" . implode( "', '", $wpdb->_escape( $paths ) ) . "'";
- $networks = $wpdb->get_results( "SELECT id, domain, path 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 ( $found ) {
- return wp_get_network( $network );
- }
-
- return false;
+ return WP_Network::get_by_path( $domain, $path, $segments );
}
/**
* Retrieve an object containing information about the requested network.
*
* @since 3.9.0
+ * @since 4.4.0 Converted to leverage WP_Network
*
* @param object|int $network The network's database row or ID.
- * @return object|bool Object containing network information if found, false if not.
+ * @return WP_Network|false Object containing network information if found, false if not.
*/
function wp_get_network( $network ) {
- global $wpdb;
-
if ( ! is_object( $network ) ) {
- $network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $network ) );
- if ( ! $network ) {
- return false;
- }
+ $network = WP_Network::get_instance( $network );
+ } else {
+ $network = new WP_Network( $network );
}
return $network;
@@ -281,10 +155,12 @@ function wp_get_network( $network ) {
*
* @since 3.9.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @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;
@@ -308,6 +184,8 @@ function get_site_by_path( $domain, $path, $segments = null ) {
$path_segments = array_slice( $path_segments, 0, $segments );
}
+ $paths = array();
+
while ( count( $path_segments ) ) {
$paths[] = '/' . implode( '/', $path_segments ) . '/';
array_pop( $path_segments );
@@ -389,27 +267,48 @@ function get_site_by_path( $domain, $path, $segments = null ) {
*
* @access private
* @since 3.0.0
+ * @since 4.4.0 The `$domain` and `$path` parameters were added.
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string $domain The requested domain for the error to reference.
+ * @param string $path The requested path for the error to reference.
*/
-function ms_not_installed() {
- global $wpdb, $domain, $path;
+function ms_not_installed( $domain, $path ) {
+ global $wpdb;
+
+ if ( ! is_admin() ) {
+ dead_db();
+ }
wp_load_translations_early();
$title = __( 'Error establishing a database connection' );
+
$msg = '
' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '
'; $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) ); if ( ! $wpdb->get_var( $query ) ) { - $msg .= '' . sprintf( __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s
. You really should look at your database now.' ), $wpdb->site ) . '
' . sprintf(
+ /* translators: %s: table name */
+ __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
+ '' . $wpdb->site . '
'
+ ) . '
' . sprintf( __( 'Could not find site %1$s
. Searched for table %2$s
in database %3$s
. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '
' . sprintf(
+ /* translators: 1: site url, 2: table name, 3: database name */
+ __( 'Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?' ),
+ '' . rtrim( $domain . $path, '/' ) . '
',
+ '' . $wpdb->blogs . '
',
+ '' . DB_NAME . '
'
+ ) . '
' . __( 'What do I do now?' ) . ' '; - $msg .= __( 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' ); + /* translators: %s: Codex URL */ + $msg .= sprintf( __( 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' ), + __( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' ) + ); $msg .= ' ' . __( 'If you’re still stuck with this message, then check that your database contains the following tables:' ) . '