update deprecated WPMS hooks (#246)

Conditionally use "wp_initialize_site" and "wp_delete_site" on sites
running on WP 5.1 and above in favor of the deprecated "delete_blog" and
"wpmu_new_blog" hooks.

Co-authored-by: Stefan Kalscheuer <[email protected]>

Author: ouun

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. This projec
 Requires PHP 5.6 and WordPress 4.7 or above
 
 * Enhance: adjust styling for setup instructions (#215, props timse201)
+* Enhance: update hooks for Multisite initialization in WordPress 5.1 and above (#246, props ouun)
 
 
 ## 2.3.2

inc/class-cachify.php

@@ -132,9 +132,14 @@ public function __construct() {
 
 		if ( is_admin() ) {
 			/* Backend */
-			add_action( 'wpmu_new_blog', array( __CLASS__, 'install_later' ) );
-
-			add_action( 'delete_blog', array( __CLASS__, 'uninstall_later' ) );
+			if ( version_compare( get_bloginfo( 'version' ), '5.1', '<' ) ) {
+				// The following hooks are deprecated since WP 5.1 (#246).
+				add_action( 'wpmu_new_blog', array( __CLASS__, 'install_later' ) );
+				add_action( 'delete_blog', array( __CLASS__, 'uninstall_later' ) );
+			} else {
+				add_action( 'wp_initialize_site', array( __CLASS__, 'install_later' ) );
+				add_action( 'wp_delete_site', array( __CLASS__, 'uninstall_later' ) );
+			}
 
 			add_action( 'admin_init', array( __CLASS__, 'register_textdomain' ) );
 
@@ -210,21 +215,21 @@ public static function on_activation() {
 	}
 
 	/**
-	 * Plugin installation on new MU blog.
+	 * Plugin installation on new WPMS site.
 	 *
-	 * @since   1.0
-	 * @change  1.0
+	 * @since 1.0
+	 * @since 2.4 supports WP_Site argument
 	 *
-	 * @param integer $id  Blog ID.
+	 * @param int|WP_Site $new_site New site ID or object.
 	 */
-	public static function install_later( $id ) {
+	public static function install_later( $new_site ) {
 		/* No network plugin */
 		if ( ! is_plugin_active_for_network( CACHIFY_BASE ) ) {
 			return;
 		}
 
 		/* Switch to blog */
-		switch_to_blog( $id );
+		switch_to_blog( is_int( $new_site ) ? $new_site : $new_site->blog_id );
 
 		/* Install */
 		self::_install_backend();
@@ -281,21 +286,21 @@ public static function on_uninstall() {
 	}
 
 	/**
-	 * Uninstalling of the plugin for MU and network.
+	 * Uninstalling of the plugin for WPMS site.
 	 *
-	 * @since   1.0
-	 * @change  1.0
+	 * @since 1.0
+	 * @since 2.4 supports WP_Site argument
 	 *
-	 * @param integer $id  Blog ID.
+	 * @param int|WP_Site $old_site Old site ID or object.
 	 */
-	public static function uninstall_later( $id ) {
+	public static function uninstall_later( $old_site ) {
 		/* No network plugin */
 		if ( ! is_plugin_active_for_network( CACHIFY_BASE ) ) {
 			return;
 		}
 
 		/* Switch to blog */
-		switch_to_blog( $id );
+		switch_to_blog( is_int( $old_site ) ? $old_site : $old_site->blog_id );
 
 		/* Install */
 		self::_uninstall_backend();