Changeset 42343 for trunk/src/wp-includes/class-wp-network.php

Timestamp:

11/30/2017 11:09:33 PM (9 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/class-wp-network.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-network.php

@@ -126 +126 @@
          */
         public function __construct( $network ) {
-                foreach( get_object_vars( $network ) as $key => $value ) {
+                foreach ( get_object_vars( $network ) as $key => $value ) {
                         $this->$key = $value;
                 }
@@ -255 +255 @@
                         $main_site_id = wp_cache_get( $cache_key, 'site-options' );
                         if ( false === $main_site_id ) {
-                                $_sites = get_sites( array(
-                                        'fields'     => 'ids',
-                                        'number'     => 1,
-                                        'domain'     => $this->domain,
-                                        'path'       => $this->path,
-                                        'network_id' => $this->id,
-                                ) );
+                                $_sites       = get_sites(
+                                        array(
+                                                'fields'     => 'ids',
+                                                'number'     => 1,
+                                                'domain'     => $this->domain,
+                                                'path'       => $this->path,
+                                                'network_id' => $this->id,
+                                        )
+                                );
                                 $main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
 
@@ -283 +285 @@
                 }
 
-                $default = ucfirst( $this->domain );
+                $default         = ucfirst( $this->domain );
                 $this->site_name = get_network_option( $this->id, 'site_name', $default );
         }
@@ -351 +353 @@
                         $using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
                         if ( false === $using_paths ) {
-                                $using_paths = get_networks( array(
-                                        'number'       => 1,
-                                        'count'        => true,
-                                        'path__not_in' => '/',
-                                ) );
-                                wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
+                                $using_paths = get_networks(
+                                        array(
+                                                'number'       => 1,
+                                                'count'        => true,
+                                                'path__not_in' => '/',
+                                        )
+                                );
+                                wp_cache_add( 'networks_have_paths', $using_paths, 'site-options' );
                         }
                 }
@@ -414 +418 @@
 
                 if ( ! $using_paths ) {
-                        $networks = get_networks( array(
-                                'number'     => 1,
+                        $networks = get_networks(
+                                array(
+                                        'number'     => 1,
+                                        'orderby'    => array(
+                                                'domain_length' => 'DESC',
+                                        ),
+                                        'domain__in' => $domains,
+                                )
+                        );
+
+                        if ( ! empty( $networks ) ) {
+                                return array_shift( $networks );
+                        }
+
+                        return false;
+                }
+
+                $networks = get_networks(
+                        array(
                                 'orderby'    => array(
                                         'domain_length' => 'DESC',
+                                        'path_length'   => 'DESC',
                                 ),
                                 'domain__in' => $domains,
-                        ) );
-
-                        if ( ! empty( $networks ) ) {
-                                return array_shift( $networks );
-                        }
-
-                        return false;
-                }
-
-                $networks = get_networks( array(
-                        'orderby'    => array(
-                                'domain_length' => 'DESC',
-                                'path_length'   => 'DESC',
-                        ),
-                        'domain__in' => $domains,
-                        'path__in'   => $paths,
-                ) );
+                                'path__in'   => $paths,
+                        )
+                );
 
                 /*