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

Timestamp:

10/30/2017 07:55:09 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Pass network object instead of ID to pre_get_main_site_id.

In the original function introduced in [41380], and subsequently [41861], only the network ID was passed to the new pre_get_main_site_id filter. In order to make give quick access to other network properties, it was decided to pass the whole object instead. The changeset includes an additional test.

Fixes #29684.

File:

• trunk/src/wp-includes/class-wp-network.php (modified) (1 diff)

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

@@ -220 +220 @@
          * @since 4.9.0
          *
-         * @param int|null $main_site_id If a positive integer is returned, it is interpreted as the main site ID.
-         * @param int $network_id The ID of the network for which the main site was detected.
+         * @param int|null   $main_site_id If a positive integer is returned, it is interpreted as the main site ID.
+         * @param WP_Network $network      The network object for which the main site was detected.
          */
-        $main_site_id = (int) apply_filters( 'pre_get_main_site_id', null, $this->id );
+        $main_site_id = (int) apply_filters( 'pre_get_main_site_id', null, $this );
         if ( 0 < $main_site_id ) {
             return $main_site_id;