Wordpress 4.5.3

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

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 0f7d0ff6d37b88ed498df18c0c91f3140b7db3b3..dd17201e4c8ef1b9b8a5f04e9fbb8a16be692b1c 100644 (file)
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -14,6 +14,8 @@
  * wp-includes/ms-files.php (wp-content/blogs.php in MU).
  *
  * @since 3.0.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function ms_upload_constants() {
        global $wpdb;
@@ -114,6 +116,9 @@ function ms_file_constants() {
  * we will have translations loaded and can trigger warnings easily.
  *
  * @since 3.0.0
+ *
+ * @staticvar bool $subdomain_error
+ * @staticvar bool $subdomain_error_warn
  */
 function ms_subdomain_constants() {
        static $subdomain_error = null;
@@ -124,7 +129,14 @@ function ms_subdomain_constants() {
        }
 
        if ( $subdomain_error ) {
-               $vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
+               $vhost_deprecated = sprintf(
+                       /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
+                       __( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+                       '<code>VHOST</code>',
+                       '<code>SUBDOMAIN_INSTALL</code>',
+                       '<code>wp-config.php</code>',
+                       '<code>is_subdomain_install()</code>'
+               );
                if ( $subdomain_error_warn ) {
                        trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
                } else {
@@ -150,4 +162,3 @@ function ms_subdomain_constants() {
                define( 'VHOST', 'no' );
        }
 }
-add_action( 'init', 'ms_subdomain_constants' );