enmi-conf.org: comparison wp/wp-admin/plugins.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 );
 $_SERVER['REQUEST_URI'] = remove_query_arg( $query_args_to_remove, $_SERVER['REQUEST_URI'] );
 wp_enqueue_script( 'updates' );
+WP_Plugin_Dependencies::initialize();
 if ( $action ) {
 	switch ( $action ) {
 		case 'activate':
 				$plugins_to_delete = count( $plugin_info );
 				?>
 				<?php if ( 1 === $plugins_to_delete ) : ?>
 					<h1><?php _e( 'Delete Plugin' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
+					<?php
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
+					if ( $have_non_network_plugins && is_network_admin() ) :
-					<?php endif; ?>
+						$maybe_active_plugin = '<strong>' . __( 'Caution:' ) . '</strong> ' . __( 'This plugin may be active on other sites in the network.' );
+						wp_admin_notice(
+							$maybe_active_plugin,
+							array(
+								'additional_classes' => array( 'error' ),
+							)
+						);
+					endif;
+					?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
 				<?php else : ?>
 					<h1><?php _e( 'Delete Plugins' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
+					<?php
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
+					if ( $have_non_network_plugins && is_network_admin() ) :
-					<?php endif; ?>
+						$maybe_active_plugins = '<strong>' . __( 'Caution:' ) . '</strong> ' . __( 'These plugins may be active on other sites in the network.' );
+						wp_admin_notice(
+							$maybe_active_plugins,
+							array(
+								'additional_classes' => array( 'error' ),
+							)
+						);
+					endif;
+					?>
 					<p><?php _e( 'You are about to remove the following plugins:' ); ?></p>
 				<?php endif; ?>
 					<ul class="ul-disc">
 						<?php
 				$plugins_to_delete = count( $plugins );
 			} // End if verify-delete.
 			$delete_result = delete_plugins( $plugins );
-			// Store the result in a cache rather than a URL param due to object type & length.
+			// Store the result in an option rather than a URL param due to object type & length.
-			set_transient( 'plugins_delete_result_' . $user_ID, $delete_result );
+			// Cannot use transient/cache, as that could get flushed if any plugin flushes data on uninstall/delete.
+			update_option( 'plugins_delete_result_' . $user_ID, $delete_result, false );
 			wp_redirect( self_admin_url( "plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s" ) );
 			exit;
 		case 'clear-recent-list':
 			if ( ! is_network_admin() ) {
 				update_option( 'recently_activated', array() );
 					$query_args       = array( 'disabled-auto-update-multi' => 'true' );
 				}
 				// Return early if all selected plugins already have auto-updates enabled or disabled.
 				// Must use non-strict comparison, so that array order is not treated as significant.
-				if ( $new_auto_updates == $auto_updates ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+				if ( $new_auto_updates == $auto_updates ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
 					wp_redirect( $redirect );
 					exit;
 				}
 				$auto_updates = $new_auto_updates;
 		'content' =>
 				'<p>' . __( 'Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.' ) . '</p>' .
 				'<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
 				'<p>' . sprintf(
 					/* translators: %s: WordPress Plugin Directory URL. */
-					__( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
+					__( 'If you would like to see more plugins to choose from, click on the &#8220;Add New Plugin&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
 					__( 'https://wordpress.org/plugins/' )
 				) . '</p>',
 	)
 );
 get_current_screen()->add_help_tab(
 					'<p>' . __( 'Auto-updates are only available for plugins recognized by WordPress.org, or that include a compatible update system.' ) . '</p>' .
 					'<p>' . __( 'Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.' ) . '</p>',
 		)
 	);
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-themes-auto-updates/">Documentation on Auto-updates</a>' ) . '</p>';
 }
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/managing-plugins/">Documentation on Managing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/manage-plugins/">Documentation on Managing Plugins</a>' ) . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 get_current_screen()->set_screen_reader_content(
 	array(
 		'heading_views'      => __( 'Filter plugins list' ),
 require_once ABSPATH . 'wp-admin/admin-header.php';
 $invalid = validate_active_plugins();
 if ( ! empty( $invalid ) ) {
 	foreach ( $invalid as $plugin_file => $error ) {
-		echo '<div id="message" class="error"><p>';
+		$deactivated_message = sprintf(
-		printf(
 			/* translators: 1: Plugin file, 2: Error message. */
 			__( 'The plugin %1$s has been deactivated due to an error: %2$s' ),
 			'<code>' . esc_html( $plugin_file ) . '</code>',
 			esc_html( $error->get_error_message() )
 		);
-		echo '</p></div>';
+		wp_admin_notice(
+			$deactivated_message,
+			array(
+				'id'                 => 'message',
+				'additional_classes' => array( 'error' ),
+			)
+		);
 	}
 }
-if ( isset( $_GET['error'] ) ) :
+// Used by wp_admin_notice() updated notices.
+$updated_notice_args = array(
+	'id'                 => 'message',
+	'additional_classes' => array( 'updated' ),
+	'dismissible'        => true,
+);
+if ( isset( $_GET['error'] ) ) {
 	if ( isset( $_GET['main'] ) ) {
 		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
 	} elseif ( isset( $_GET['charsout'] ) ) {
 		$errmsg = sprintf(
 		$errmsg = __( 'Plugin could not be resumed because it triggered a <strong>fatal error</strong>.' );
 	} else {
 		$errmsg = __( 'Plugin could not be activated because it triggered a <strong>fatal error</strong>.' );
 	}
-	?>
-	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
-	<?php
 	if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] )
 		&& isset( $_GET['_error_nonce'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin )
 	) {
 		$iframe_url = add_query_arg(
 			array(
 				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
 			),
 			admin_url( 'plugins.php' )
 		);
-		?>
+		$errmsg .= '<iframe style="border:0" width="100%" height="70px" src="' . esc_url( $iframe_url ) . '"></iframe>';
-		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
-		<?php
 	}
-	?>
+	wp_admin_notice(
-	</div>
+		$errmsg,
-	<?php
+		array(
-elseif ( isset( $_GET['deleted'] ) ) :
+			'id'                 => 'message',
-	$delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
+			'additional_classes' => array( 'error' ),
+		)
+	);
+} elseif ( isset( $_GET['deleted'] ) ) {
+	$delete_result = get_option( 'plugins_delete_result_' . $user_ID );
 	// Delete it once we're done.
-	delete_transient( 'plugins_delete_result_' . $user_ID );
+	delete_option( 'plugins_delete_result_' . $user_ID );
-	if ( is_wp_error( $delete_result ) ) :
+	if ( is_wp_error( $delete_result ) ) {
-		?>
+		$plugin_not_deleted_message = sprintf(
-		<div id="message" class="error notice is-dismissible">
+			/* translators: %s: Error message. */
-			<p>
+			__( 'Plugin could not be deleted due to an error: %s' ),
-				<?php
+			esc_html( $delete_result->get_error_message() )
-				printf(
+		);
-					/* translators: %s: Error message. */
+		wp_admin_notice(
-					__( 'Plugin could not be deleted due to an error: %s' ),
+			$plugin_not_deleted_message,
-					esc_html( $delete_result->get_error_message() )
+			array(
-				);
+				'id'                 => 'message',
-				?>
+				'additional_classes' => array( 'error' ),
-			</p>
+				'dismissible'        => true,
-		</div>
+			)
-		<?php else : ?>
+		);
-		<div id="message" class="updated notice is-dismissible">
+	} else {
-			<p>
+		if ( 1 === (int) $_GET['deleted'] ) {
-				<?php
+			$plugins_deleted_message = __( 'The selected plugin has been deleted.' );
-				if ( 1 === (int) $_GET['deleted'] ) {
+		} else {
-					_e( 'The selected plugin has been deleted.' );
+			$plugins_deleted_message = __( 'The selected plugins have been deleted.' );
-				} else {
+		}
-					_e( 'The selected plugins have been deleted.' );
+		wp_admin_notice( $plugins_deleted_message, $updated_notice_args );
-				}
+	}
-				?>
+} elseif ( isset( $_GET['activate'] ) ) {
-			</p>
+	wp_admin_notice( __( 'Plugin activated.' ), $updated_notice_args );
-		</div>
+} elseif ( isset( $_GET['activate-multi'] ) ) {
-	<?php endif; ?>
+	wp_admin_notice( __( 'Selected plugins activated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['activate'] ) ) : ?>
+} elseif ( isset( $_GET['deactivate'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin activated.' ); ?></p></div>
+	wp_admin_notice( __( 'Plugin deactivated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['activate-multi'] ) ) : ?>
+} elseif ( isset( $_GET['deactivate-multi'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins activated.' ); ?></p></div>
+	wp_admin_notice( __( 'Selected plugins deactivated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['deactivate'] ) ) : ?>
+} elseif ( 'update-selected' === $action ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin deactivated.' ); ?></p></div>
+	wp_admin_notice( __( 'All selected plugins are up to date.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['deactivate-multi'] ) ) : ?>
+} elseif ( isset( $_GET['resume'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins deactivated.' ); ?></p></div>
+	wp_admin_notice( __( 'Plugin resumed.' ), $updated_notice_args );
-<?php elseif ( 'update-selected' === $action ) : ?>
+} elseif ( isset( $_GET['enabled-auto-update'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'All selected plugins are up to date.' ); ?></p></div>
+	wp_admin_notice( __( 'Plugin will be auto-updated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['resume'] ) ) : ?>
+} elseif ( isset( $_GET['disabled-auto-update'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin resumed.' ); ?></p></div>
+	wp_admin_notice( __( 'Plugin will no longer be auto-updated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['enabled-auto-update'] ) ) : ?>
+} elseif ( isset( $_GET['enabled-auto-update-multi'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin will be auto-updated.' ); ?></p></div>
+	wp_admin_notice( __( 'Selected plugins will be auto-updated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['disabled-auto-update'] ) ) : ?>
+} elseif ( isset( $_GET['disabled-auto-update-multi'] ) ) {
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin will no longer be auto-updated.' ); ?></p></div>
+	wp_admin_notice( __( 'Selected plugins will no longer be auto-updated.' ), $updated_notice_args );
-<?php elseif ( isset( $_GET['enabled-auto-update-multi'] ) ) : ?>
+}
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins will be auto-updated.' ); ?></p></div>
+?>
-<?php elseif ( isset( $_GET['disabled-auto-update-multi'] ) ) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins will no longer be auto-updated.' ); ?></p></div>
+<?php WP_Plugin_Dependencies::display_admin_notice_for_unmet_dependencies(); ?>
-<?php endif; ?>
+<?php WP_Plugin_Dependencies::display_admin_notice_for_circular_dependencies(); ?>
 <div class="wrap">
 <h1 class="wp-heading-inline">
 <?php
 echo esc_html( $title );
 ?>
 </h1>
 <?php
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_plugins' ) ) {
 	?>
-	<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
+	<a href="<?php echo esc_url( self_admin_url( 'plugin-install.php' ) ); ?>" class="page-title-action"><?php echo esc_html__( 'Add New Plugin' ); ?></a>
 	<?php
 }
 if ( strlen( $s ) ) {
 	echo '<span class="subtitle">';
 ?>
 <?php $wp_list_table->views(); ?>
 <form class="search-form search-plugins" method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Plugins' ), 'plugin' ); ?>
+<?php $wp_list_table->search_box( __( 'Search installed plugins' ), 'plugin' ); ?>
 </form>
 <form method="post" id="bulk-action-form">
 <input type="hidden" name="plugin_status" value="<?php echo esc_attr( $status ); ?>" />

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef