WP.org Abilities: Fully load the plugin directory for MCP requests.

Previously, only the class autoloader was loaded when handling MCP
requests. This meant post types and custom statuses were not registered,
so queries for plugins in the review queue returned empty results.

Load the plugin bootstrap and run its initialization to ensure the
full runtime environment is available. Also use the plugin directory's
own slug lookup for consistency with the rest of the codebase.

git-svn-id: https://meta.svn.wordpress.org/sites/trunk@14769 74240141-8908-4e6f-9713-ba540dce6ec7

Author: obenland

wordpress.org/public_html/wp-content/plugins/wporg-abilities/plugins/plugin-directory/class-ability-base.php

@@ -12,6 +12,8 @@
 
 namespace WordPressdotorg\Abilities\Plugins\Plugin_Directory;
 
+use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -46,19 +48,11 @@ protected static function maybe_load_plugin_directory(): void {
 			return;
 		}
 
-		$autoloader = WP_PLUGIN_DIR . '/plugin-directory/class-autoloader.php';
-
-		if ( ! file_exists( $autoloader ) ) {
-			return;
-		}
+		switch_to_blog( self::PLUGINS_BLOG_ID );
 
-		require_once $autoloader;
-		\WordPressdotorg\Plugin_Directory\Autoloader\register_class_path(
-			'WordPressdotorg\\Plugin_Directory',
-			WP_PLUGIN_DIR . '/plugin-directory'
-		);
+		require_once WP_PLUGIN_DIR . '/plugin-directory/plugin-directory.php';
 
-		switch_to_blog( self::PLUGINS_BLOG_ID );
+		Plugin_Directory::instance()->init();
 
 		$loaded = true;
 	}

wordpress.org/public_html/wp-content/plugins/wporg-abilities/plugins/plugin-directory/tools/class-get-plugin-status.php

@@ -11,6 +11,7 @@
 
 use WordPressdotorg\Abilities\Plugins\Plugin_Directory\Ability_Base;
 use WordPressdotorg\Plugin_Directory\Clients\HelpScout as HelpScout_Client;
+use WordPressdotorg\Plugin_Directory\Plugin_Directory;
 use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools\Helpscout;
 
@@ -142,12 +143,15 @@ public static function check_permission(): bool|\WP_Error {
 	public static function execute( array $input ): array {
 		self::maybe_load_plugin_directory();
 
-		$slug = sanitize_title( $input['plugin_slug'] );
-		$post = self::get_plugin_post( $slug );
+		$post = Plugin_Directory::get_plugin_post( $input['plugin_slug'] );
+
+		if ( $post && (int) $post->post_author !== get_current_user_id() ) {
+			$post = false;
+		}
 
 		if ( ! $post ) {
 			return array(
-				'error' => sprintf( 'No plugin with slug "%s" was found for your account.', $slug ),
+				'error' => sprintf( 'No plugin with slug "%s" was found for your account.', sanitize_title( $input['plugin_slug'] ) ),
 			);
 		}
 
@@ -159,26 +163,6 @@ public static function execute( array $input ): array {
 		);
 	}
 
-	/**
-	 * Look up a plugin post owned by the current user.
-	 *
-	 * @param string $slug The plugin slug.
-	 * @return \WP_Post|null
-	 */
-	private static function get_plugin_post( string $slug ): ?\WP_Post {
-		$posts = get_posts(
-			array(
-				'post_type'   => 'plugin',
-				'name'        => $slug,
-				'post_status' => 'any',
-				'author'      => get_current_user_id(),
-				'numberposts' => 1,
-			)
-		);
-
-		return $posts[0] ?? null;
-	}
-
 	/**
 	 * Build status data for the plugin.
 	 *

wordpress.org/public_html/wp-content/plugins/wporg-abilities/plugins/plugin-directory/tools/class-submit-plugin.php

@@ -10,6 +10,7 @@
 namespace WordPressdotorg\Abilities\Plugins\Plugin_Directory\Tools;
 
 use WordPressdotorg\Abilities\Plugins\Plugin_Directory\Ability_Base;
+use WordPressdotorg\Plugin_Directory\Plugin_Directory;
 use WordPressdotorg\Plugin_Directory\Shortcodes\Upload_Handler;
 
 defined( 'ABSPATH' ) || exit;
@@ -206,13 +207,12 @@ public static function execute( array $input ): array {
 		// Step 3: Resolve $plugin_post_id.
 		$plugin_post_id = 0;
 		if ( $is_update ) {
-			$slug = sanitize_title( $input['plugin_slug'] );
-			$post = self::find_plugin_post( $slug );
+			$post = Plugin_Directory::get_plugin_post( $input['plugin_slug'] );
 
 			if ( ! $post ) {
 				return self::error_response(
 					'plugin_not_found',
-					sprintf( 'No plugin with slug "%s" was found for your account.', $slug ),
+					sprintf( 'No plugin with slug "%s" was found for your account.', sanitize_title( $input['plugin_slug'] ) ),
 					'Use wporg://plugins/plugin-directory/get-plugin-status to check your plugin slugs.'
 				);
 			}
@@ -475,30 +475,6 @@ private static function prepare_zip_from_base64( string $base64 ): array|string
 		return $temp_path;
 	}
 
-	/**
-	 * Find a plugin post owned by the current user or accessible to a plugin reviewer.
-	 *
-	 * @param string $slug The plugin slug.
-	 * @return \WP_Post|null
-	 */
-	private static function find_plugin_post( string $slug ): ?\WP_Post {
-		$query_args = array(
-			'post_type'   => 'plugin',
-			'name'        => $slug,
-			'post_status' => 'any',
-			'numberposts' => 1,
-		);
-
-		// Scope to the current user unless they can review plugins.
-		if ( ! current_user_can( 'plugin_approve' ) ) { // phpcs:ignore WordPress.WP.Capabilities.Unknown -- plugin_approve is registered by the plugin-directory plugin.
-			$query_args['author'] = get_current_user_id();
-		}
-
-		$posts = get_posts( $query_args );
-
-		return $posts[0] ?? null;
-	}
-
 	/**
 	 * Build a structured error response.
 	 *