Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php	(revision 5315)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php	(working copy)
@@ -4,6 +4,21 @@
 class Upload {
 
 	/**
+	 * Retrieves plugins in the queue submitted by the current user.
+	 *
+	 * @return array An array of user's plugins.
+	 */
+	public static function get_submitted_plugins() {
+		global $wpdb;
+
+		$query = "SELECT post_title, post_status FROM {$wpdb->posts} WHERE post_type = 'plugin'";
+		$query .= $wpdb->prepare( " AND post_status IN ( 'draft', 'pending' ) AND post_author = %d", get_current_user_id() );
+		$query .= ' ORDER BY post_title';
+
+		return $wpdb->get_results( $query );
+	}
+
+	/**
 	 * Renders the upload shortcode.
 	 */
 	public static function display() {
@@ -31,21 +46,77 @@
 				<div class="plugin-queue-message notice notice-info notice-alt">
 					<p>
 						<?php
-						printf( _n( 'Currently there is %1$s plugin in the review queue.', 'Currently there are %1$s plugins in the review queue, %2$s of which are awaiting their initial review.', ( $plugins->draft + $plugins->pending ), 'wporg-plugins' ),
-							'<strong>' . ( $plugins->draft + $plugins->pending ) . '</strong>',
-							'<strong>' . $plugins->draft . '</strong>'
-						);
+						if ( 1 === ( $plugins->draft + $plugins->pending ) ) {
+							 _e( 'Currently there is 1 plugin in the review queue.', 'wporg-plugins' );
+						} else {
+							printf(
+								_n(
+									'Currently there are %1$s plugins in the review queue, %2$s of which is awaiting its initial review.',
+									'Currently there are %1$s plugins in the review queue, %2$s of which are awaiting their initial review.',
+									$plugins->draft,
+									'wporg-plugins'
+								),
+								'<strong>' . ( $plugins->draft + $plugins->pending ) . '</strong>',
+								'<strong>' . $plugins->draft . '</strong>'
+							);
+						}
 						?>
 					</p>
 				</div>
+
 				<?php
-				if ( '/plugins-wp' === parse_url( home_url(), PHP_URL_PATH ) ) {
-					echo '<div class="notice notice-error notice-alt">
-						<p>Please submit all new plugin requests through the existing form <a href="https://wordpress.org/plugins/add/">available here</a>, You\'re currently viewing the beta version of the upcoming plugin directory, and this form is only for testing purposes.</p>
-					</div>';
+				$submitted_plugins = self::get_submitted_plugins();
+				$submitted_counts  = (object) array_fill_keys( array( 'draft', 'pending' ), 0 );
+
+				foreach ( $submitted_plugins as $key => $plugin ) {
+					if ( 'draft' === $plugin->post_status ) {
+						$submitted_plugins[ $key ]->status = __( 'Awaiting Review', 'wporg-plugins' );
+						$submitted_counts->draft++;
+					} elseif ( 'pending' === $plugin->post_status ) {
+						$submitted_plugins[ $key ]->status = __( 'Being Reviewed', 'wporg-plugins' );
+						$submitted_counts->pending++;
+					}
 				}
 				?>
 
+				<?php if ( $submitted_counts->draft + $submitted_counts->pending ) : ?>
+
+					<div class="plugin-queue-message notice notice-warning notice-alt">
+						<p>
+							<?php
+							if ( 1 === ( $submitted_counts->draft + $submitted_counts->pending ) ) {
+								_e( 'You have 1 plugin in the review queue.', 'wporg-plugins' );
+							} else {
+								printf(
+									_n(
+										'You have %1$s plugins in the review queue, %2$s is being actively reviewed.',
+										'You have %1$s plugins in the review queue, %2$s are being actively reviewed.',
+										$submitted_counts->pending,
+										'wporg-plugins'
+									),
+									'<strong>' . ( $submitted_counts->draft + $submitted_counts->pending ) . '</strong>',
+									'<strong>' . $submitted_counts->pending . '</strong>'
+								);
+							}
+							?>
+						</p>
+						<ul>
+							<?php
+							foreach ( $submitted_plugins as $plugin ) {
+								echo '<li>' . esc_html( $plugin->post_title ) . ' &#8212; ' . $plugin->status . '</li>';
+							}
+							?>
+						</ul>
+						<p><?php
+							/* translators: %s: plugins@wordpress.org */
+							printf( __( 'Please wait at least 7 business days before asking for an update status from <a href="mailto:%1$s">%1$s</a>.', 'wporg-plugins' ),
+								'plugins@wordpress.org'
+							);
+						?></p>
+					</div>
+
+				<?php endif; ?>
+
 			<?php endif; ?>
 
 			<form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">