Changeset 14452 for trunk/wp-includes/ms-default-constants.php

Timestamp:

05/04/2010 08:48:28 PM (16 years ago)

Author:

nacin

Message:

Deprecate VHOST in favor of a boolean, SUBDOMAIN_INSTALL. Core will keep VHOST defined for plugins' sake, but you should only define SUBDOMAIN_INSTALL. Throws a notice if VHOST is defined, and a warning if they somehow conflict. Sunrise can still handle them. fixes #11796.

File:

• trunk/wp-includes/ms-default-constants.php (modified) (1 diff)

trunk/wp-includes/ms-default-constants.php

@@ -92 +92 @@
                 define( 'WPMU_ACCEL_REDIRECT', false );
 }
+
+/**
+ * Defines Multisite subdomain constants and handles warnings and notices.
+ *
+ * VHOST is deprecated in favor of SUBDOMAIN_INSTALL, which is a bool.
+ *
+ * On first call, the constants are checked and defined. On second call,
+ * we will have translations loaded and can trigger warnings easily.
+ *
+ * @since 3.0.0
+ */
+function ms_subdomain_constants() {
+        static $error = null;
+        static $error_warn = false;
+        
+        if ( false === $error )
+                return;
+
+        if ( $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.' );
+                if ( $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 {
+                        _deprecated_argument( 'define()', '3.0', $vhost_deprecated );
+                }
+                return;
+        }
+
+        if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
+                if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {
+                        $error = true;
+                } else {
+                        $error = $error_warn = true;
+                }
+        } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+                define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
+        } elseif ( defined( 'VHOST' ) ) {
+                $error = true;
+                define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
+        } else {        
+                define( 'SUBDOMAIN_INSTALL', false );
+                define( 'VHOST', 'no' );
+        }
+}
+add_action( 'init', 'ms_subdomain_constants' );
+
 ?>