Merge pull request #428 from 10up/feature/wp-compat-check-7.1

WordPress 7.1 Compatibility Updates

Author: peterwilsoncc

.github/workflows/cypress.yml

@@ -53,7 +53,7 @@ jobs:
         core:
           - {name: 'WP latest', version: 'latest'}
           - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
-          - {name: 'WP minimum', version: 'WordPress/WordPress#6.6'}
+          - {name: 'WP minimum', version: 'WordPress/WordPress#6.9'}
 
     steps:
     - name: Checkout

readme.txt

@@ -2,7 +2,7 @@
 Contributors:      10up, jakemgold, rcbth, thinkoomph, tlovett1, jeffpaul, nomnom99
 Donate link:       https://10up.com/plugins/restricted-site-access-wordpress/
 Tags:              privacy, restrict, limited, permissions, security
-Tested up to:      7.0
+Tested up to:      7.1
 Stable tag:        7.6.1
 License:           GPL-2.0-or-later
 License URI:       https://spdx.org/licenses/GPL-2.0-or-later.html

restricted_site_access.php

@@ -4,7 +4,7 @@
  * Plugin URI:        https://10up.com/plugins/restricted-site-access-wordpress/
  * Description:       <strong>Limit access your site</strong> to visitors who are logged in or accessing the site from a set of specific IP addresses. Send restricted visitors to the log in page, redirect them, or display a message or page. <strong>Powerful control over redirection</strong>, including <strong>SEO friendly redirect headers</strong>. Great solution for Extranets, publicly hosted Intranets, or parallel development sites.
  * Version:           7.6.1
- * Requires at least: 6.6
+ * Requires at least: 6.9
  * Requires PHP:      7.4
  * Author:            10up
  * Author URI:        https://10up.com
@@ -150,7 +150,7 @@ public static function add_actions() {
 
 		add_action( 'activate_' . self::$basename, array( __CLASS__, 'activation' ), 10, 1 );
 		add_action( 'deactivate_' . self::$basename, array( __CLASS__, 'deactivation' ), 10, 1 );
-		add_action( 'wpmu_new_blog', array( __CLASS__, 'set_defaults' ) );
+		add_action( 'wp_initialize_site', array( __CLASS__, 'set_defaults' ), 10, 1 );
 		add_action( 'admin_enqueue_scripts', array( __CLASS__, 'enqueue_admin_script' ) );
 		add_action( 'wp_ajax_rsa_notice_dismiss', array( __CLASS__, 'ajax_notice_dismiss' ) );
 
@@ -302,11 +302,17 @@ public static function ajax_notice_dismiss() {
 	}
 
 	/**
-	 * Set RSA defaults for new site.
+	 * Set RSA defaults for a new site.
 	 *
-	 * @param int    $blog_id New site/blog ID.
+	 * @param WP_Site|int $new_site New site object or ID.
 	 */
-	public static function set_defaults( $blog_id ) {
+	public static function set_defaults( $new_site ) {
+		$new_site = get_site( $new_site );
+
+		if ( ! $new_site ) {
+			return;
+		}
+
 		if ( 'enforce' === self::get_network_mode() ) {
 			return;
 		}
@@ -315,7 +321,7 @@ public static function set_defaults( $blog_id ) {
 		$blog_public     = get_site_option( 'blog_public', 2 );
 
 		// phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.switch_to_blog_switch_to_blog -- Only used to set options/change DB prefix.
-		switch_to_blog( $blog_id );
+		switch_to_blog( $new_site->id );
 		update_option( 'rsa_options', self::sanitize_options( $network_options ) );
 		update_option( 'blog_public', (int) $blog_public );
 		restore_current_blog();

tests/php/multisite/test-settings.php

@@ -141,7 +141,7 @@ public function test_set_defaults() {
 
 			restore_current_blog();
 
-			$rsa::set_defaults( $site->blog_id, null, null, null, null, null );
+			$rsa::set_defaults( $site );
 
 			switch_to_blog( $site->blog_id );
 
@@ -173,7 +173,7 @@ public function test_set_defaults() {
 
 			restore_current_blog();
 
-			$rsa::set_defaults( $site->blog_id, null, null, null, null, null );
+			$rsa::set_defaults( $site );
 
 			switch_to_blog( $site->blog_id );
 

tests/php/test-actions.php

@@ -12,7 +12,7 @@ public function test_actions() {
 		$this->assertSame( 10, has_action( 'wp_ajax_rsa_ip_check', array( 'Restricted_Site_Access', 'ajax_rsa_ip_check' ) ) );
 		$this->assertSame( 10, has_action( 'activate_' . RSA_TEST_PLUGIN_BASENAME, array( 'Restricted_Site_Access', 'activation' ) ) );
 		$this->assertSame( 10, has_action( 'deactivate_' . RSA_TEST_PLUGIN_BASENAME, array( 'Restricted_Site_Access', 'deactivation' ) ) );
-		$this->assertSame( 10, has_action( 'wpmu_new_blog', array( 'Restricted_Site_Access', 'set_defaults' ) ) );
+		$this->assertSame( 10, has_action( 'wp_initialize_site', array( 'Restricted_Site_Access', 'set_defaults' ) ) );
 		$this->assertSame( 10, has_action( 'admin_enqueue_scripts', array( 'Restricted_Site_Access', 'enqueue_admin_script' ) ) );
 		$this->assertSame( 10, has_action( 'wp_ajax_rsa_notice_dismiss', array( 'Restricted_Site_Access', 'ajax_notice_dismiss' ) ) );
 	}