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

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/ms-default-constants.php (modified) (8 diffs)

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

@@ -20 +20 @@
     add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-    if ( ! get_site_option( 'ms_files_rewriting' ) )
+    if ( ! get_site_option( 'ms_files_rewriting' ) ) {
         return;
+    }
 
     // Base uploads dir relative to ABSPATH
-    if ( !defined( 'UPLOADBLOGSDIR' ) )
+    if ( ! defined( 'UPLOADBLOGSDIR' ) ) {
         define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+    }
 
     // Note, the main site in a post-MU network uses wp-content/uploads.
@@ -35 +37 @@
 
         // Uploads dir relative to ABSPATH
-        if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
+        if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
             define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );
+        }
     }
 }
@@ -45 +48 @@
  * @since 3.0.0
  */
-function ms_cookie_constants(  ) {
+function ms_cookie_constants() {
     $current_network = get_network();
 
@@ -51 +54 @@
      * @since 1.2.0
      */
-    if ( !defined( 'COOKIEPATH' ) )
+    if ( ! defined( 'COOKIEPATH' ) ) {
         define( 'COOKIEPATH', $current_network->path );
+    }
 
     /**
      * @since 1.5.0
      */
-    if ( !defined( 'SITECOOKIEPATH' ) )
+    if ( ! defined( 'SITECOOKIEPATH' ) ) {
         define( 'SITECOOKIEPATH', $current_network->path );
+    }
 
     /**
      * @since 2.6.0
      */
-    if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
+    if ( ! defined( 'ADMIN_COOKIE_PATH' ) ) {
         if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
             define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
@@ -74 +79 @@
      * @since 2.0.0
      */
-    if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-        if ( !empty( $current_network->cookie_domain ) )
-            define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
-        else
-            define('COOKIE_DOMAIN', '.' . $current_network->domain);
+    if ( ! defined( 'COOKIE_DOMAIN' ) && is_subdomain_install() ) {
+        if ( ! empty( $current_network->cookie_domain ) ) {
+            define( 'COOKIE_DOMAIN', '.' . $current_network->cookie_domain );
+        } else {
+            define( 'COOKIE_DOMAIN', '.' . $current_network->domain );
+        }
     }
 }
@@ -93 +99 @@
     /**
      * Optional support for X-Sendfile header
+     *
      * @since 3.0.0
      */
-    if ( !defined( 'WPMU_SENDFILE' ) )
+    if ( ! defined( 'WPMU_SENDFILE' ) ) {
         define( 'WPMU_SENDFILE', false );
+    }
 
     /**
      * Optional support for X-Accel-Redirect header
+     *
      * @since 3.0.0
      */
-    if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
+    if ( ! defined( 'WPMU_ACCEL_REDIRECT' ) ) {
         define( 'WPMU_ACCEL_REDIRECT', false );
+    }
 }
 
@@ -120 +130 @@
  */
 function ms_subdomain_constants() {
-    static $subdomain_error = null;
+    static $subdomain_error      = null;
     static $subdomain_error_warn = null;
 
@@ -139 +149 @@
             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.0', $vhost_deprecated );
+            _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
         }
         return;