enmi-conf.org: comparison wp/wp-includes/class-wp-network.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 	 * @since 4.4.0
 	 *
 	 * @param WP_Network|object $network A network object.
 	 */
 	public function __construct( $network ) {
-		foreach( get_object_vars( $network ) as $key => $value ) {
+		foreach ( get_object_vars( $network ) as $key => $value ) {
 			$this->$key = $value;
 		}
 		$this->_set_site_name();
 		$this->_set_cookie_domain();
 		} else {
 			$cache_key = 'network:' . $this->id . ':main_site';
 			$main_site_id = wp_cache_get( $cache_key, 'site-options' );
 			if ( false === $main_site_id ) {
-				$_sites = get_sites( array(
+				$_sites       = get_sites(
-					'fields'     => 'ids',
+					array(
-					'number'     => 1,
+						'fields'     => 'ids',
-					'domain'     => $this->domain,
+						'number'     => 1,
-					'path'       => $this->path,
+						'domain'     => $this->domain,
-					'network_id' => $this->id,
+						'path'       => $this->path,
-				) );
+						'network_id' => $this->id,
+					)
+				);
 				$main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
 				wp_cache_add( $cache_key, $main_site_id, 'site-options' );
 			}
 		}
 	private function _set_site_name() {
 		if ( ! empty( $this->site_name ) ) {
 			return;
 		}
-		$default = ucfirst( $this->domain );
+		$default         = ucfirst( $this->domain );
 		$this->site_name = get_network_option( $this->id, 'site_name', $default );
 	}
 	/**
 	 * Set the cookie domain based on the network domain if one has
 	 *
 	 * The intent of this method is to match a network during bootstrap for a
 	 * requested site address.
 	 *
 	 * @since 4.4.0
-	 * @static
 	 *
 	 * @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 WP_Network|bool Network object if successful. False when no network is found.
 		 */
 		$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 = get_networks( array(
+				$using_paths = get_networks(
-					'number'       => 1,
+					array(
-					'count'        => true,
+						'number'       => 1,
-					'path__not_in' => '/',
+						'count'        => true,
-				) );
+						'path__not_in' => '/',
-				wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
+					)
+				);
+				wp_cache_add( 'networks_have_paths', $using_paths, 'site-options' );
 			}
 		}
 		$paths = array();
 		if ( $using_paths ) {
 		 * 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 null|bool|WP_Network $network  Network value to return by path.
-		 * @param string           $domain   The requested domain.
+		 * @param string               $domain   The requested domain.
-		 * @param string           $path     The requested path, in full.
+		 * @param string               $path     The requested path, in full.
-		 * @param int|null         $segments The suggested number of paths to consult.
+		 * @param int|null             $segments The suggested number of paths to consult.
-		 *                                   Default null, meaning the entire path was to be consulted.
+		 *                                       Default null, meaning the entire path was to be consulted.
-		 * @param array            $paths    The paths to search for, based on $path and $segments.
+		 * @param string[]             $paths    Array of 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;
 		}
 		if ( ! $using_paths ) {
-			$networks = get_networks( array(
+			$networks = get_networks(
-				'number'     => 1,
+				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,
-			) );
+				'path__in'   => $paths,
+			)
-			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,
-		) );
 		/*
 		 * 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.

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4