PCP issues addressed

Author: lloc

modules/GetSiteBy/patches/40180.php

@@ -16,7 +16,7 @@
  * @param int|null   $network_id Optional. ID of the network. Default is the current network.
  * @return WP_Site|null The site object or null if not found.
  */
-function get_site_by( $field, $value, $network_id = null ) {
+function multisyde_get_site_by( $field, $value, $network_id = null ) {
 	$args = array();
 
 	if ( 'id' === $field ) {
@@ -116,3 +116,22 @@ function get_site_by( $field, $value, $network_id = null ) {
 
 	return array_shift( $sites );
 }
+
+if ( ! function_exists( 'get_site_by' ) ) {
+	/**
+	 * Wrapper for WordPress core compatibility.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @param string     $field      Name of a field to query against. Accepts 'id', 'slug', 'url',
+	 *                               'domain' (if a subdomain-install) or 'path' (if a subdirectory-install).
+	 * @param string|int $value      The search value for $field.
+	 * @param int|null   $network_id Optional. ID of the network. Default is the current network.
+	 * @return WP_Site|null The site object or null if not found.
+	 *
+	 * @phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
+	 */
+	function get_site_by( $field, $value, $network_id = null ) {
+		return multisyde_get_site_by( $field, $value, $network_id );
+	}
+}

modules/SiteActivePlugins/Feature.php

@@ -18,6 +18,7 @@ final class Feature implements LoadableFeature {
 	const NOTICE_DEACTIVATION = 'bulk_deactivated';
 
 	const DEFAULT_MAX_SITES = 100;
+	const FILTER_MAX_SITES  = 'multisyde_site_active_plugins_max_sites';
 
 	/**
 	 * The active plugins in the sites in the network.
@@ -161,7 +162,7 @@ public function populate_active_plugins(): void {
 		 *
 		 * @param int $max_sites The maximum number of sites to show for each plugin.
 		 */
-		$max_sites = apply_filters( 'site_active_plugins_max_sites', self::DEFAULT_MAX_SITES );
+		$max_sites = apply_filters( self::FILTER_MAX_SITES, self::DEFAULT_MAX_SITES );
 		$site_ids  = get_sites(
 			array(
 				'fields' => 'ids',