Merge branch 'trunk' into add/basic-relay-support

Automattic · Feb 28, 2025 · 9fcd201 · 9fcd201
2 parents 200a106 + c46f8a6
commit 9fcd201
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 39 deletions.
diff --git a/includes/class-activitypub.php b/includes/class-activitypub.php
@@ -43,12 +43,6 @@ public static function init() {
 
 		\add_action( 'user_register', array( self::class, 'user_register' ) );
 
-		\add_action( 'in_plugin_update_message-' . ACTIVITYPUB_PLUGIN_BASENAME, array( self::class, 'plugin_update_message' ) );
-
-		if ( site_supports_blocks() ) {
-			\add_action( 'tool_box', array( self::class, 'tool_box' ) );
-		}
-
 		\add_filter( 'activitypub_get_actor_extra_fields', array( Extra_Fields::class, 'default_actor_extra_fields' ), 10, 2 );
 
 		\add_action( 'updated_postmeta', array( self::class, 'updated_postmeta' ), 10, 4 );
@@ -428,15 +422,6 @@ public static function flush_rewrite_rules() {
 		\flush_rewrite_rules();
 	}
 
-	/**
-	 * Adds metabox on wp-admin/tools.php.
-	 */
-	public static function tool_box() {
-		if ( \current_user_can( 'edit_posts' ) ) {
-			\load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/toolbox.php' );
-		}
-	}
-
 	/**
 	 * Theme compatibility stuff.
 	 */
@@ -459,30 +444,6 @@ public static function theme_compat() {
 		}
 	}
 
-	/**
-	 * Display plugin upgrade notice to users.
-	 *
-	 * @param array $data The plugin data.
-	 */
-	public static function plugin_update_message( $data ) {
-		if ( ! isset( $data['upgrade_notice'] ) ) {
-			return;
-		}
-
-		printf(
-			'<div class="update-message">%s</div>',
-			wp_kses(
-				wpautop( $data['upgrade_notice '] ),
-				array(
-					'p'      => array(),
-					'a'      => array( 'href', 'title' ),
-					'strong' => array(),
-					'em'     => array(),
-				)
-			)
-		);
-	}
-
 	/**
 	 * Register Custom Post Types.
 	 */

diff --git a/includes/wp-admin/class-admin.php b/includes/wp-admin/class-admin.php
@@ -55,6 +55,11 @@ public static function init() {
 
 		\add_filter( 'dashboard_glance_items', array( self::class, 'dashboard_glance_items' ) );
 		\add_filter( 'plugin_action_links_' . ACTIVITYPUB_PLUGIN_BASENAME, array( self::class, 'add_plugin_settings_link' ) );
+		\add_action( 'in_plugin_update_message-' . ACTIVITYPUB_PLUGIN_BASENAME, array( self::class, 'plugin_update_message' ), 10, 2 );
+
+		if ( site_supports_blocks() ) {
+			\add_action( 'tool_box', array( self::class, 'tool_box' ) );
+		}
 	}
 
 	/**
@@ -595,4 +600,25 @@ public static function add_plugin_settings_link( $actions ) {
 
 		return $actions;
 	}
+
+	/**
+	 * Display plugin upgrade notice to users.
+	 *
+	 * @param array  $data   The plugin data.
+	 * @param object $update The plugin update data.
+	 */
+	public static function plugin_update_message( $data, $update ) {
+		if ( ! isset( $update->upgrade_notice ) ) {
+			return;
+		}
+
+		echo '<br>' . wp_strip_all_tags( $update->upgrade_notice ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+	}
+
+	/**
+	 * Adds metabox on wp-admin/tools.php.
+	 */
+	public static function tool_box() {
+		\load_template( ACTIVITYPUB_PLUGIN_DIR . 'templates/toolbox.php' );
+	}
 }