Changeset 57769

Timestamp:

03/05/2024 06:25:22 AM (7 months ago)

Author:

desrosj

Message:

Plugins: Improve plugin dependency admin notices.

This makes several refinements to the various notices displayed in the WordPress admin related to plugin dependencies. Additionally, it adds some conditions to display more appropriate messages for multisite installs with proper context to the user’s capabilities.

Props costdev, joedolson, afragen, swissspidy, peterwilsoncc, euthelup.
Fixes #60465.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-plugins-list-table.php (modified) (2 diffs)
• wp-includes/class-wp-plugin-dependencies.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -1568 +1568 @@
         }
 
-        $dependency_note = __( 'Note: This plugin cannot be activated until the plugins that are required by it are activated.' );
-
-        $comma    = wp_get_list_item_separator();
-        $requires = sprintf(
+        $is_active = is_multisite() ? is_plugin_active_for_network( $dependent ) : is_plugin_active( $dependent );
+        $comma     = wp_get_list_item_separator();
+        $requires  = sprintf(
             /* translators: %s: List of dependency names. */
             __( '<strong>Requires:</strong> %s' ),
@@ -1577 +1576 @@
         );
 
+        $notice        = '';
+        $error_message = '';
+        if ( WP_Plugin_Dependencies::has_unmet_dependencies( $dependent ) ) {
+            if ( $is_active ) {
+                $error_message = __( 'This plugin is active but may not function correctly because required plugins are missing or inactive.' );
+            } else {
+                $error_message = __( 'This plugin cannot be activated because required plugins are missing or inactive.' );
+            }
+            $notice = wp_get_admin_notice(
+                $error_message,
+                array(
+                    'type'               => 'error',
+                    'additional_classes' => array( 'inline', 'notice-alt' ),
+                )
+            );
+        }
+
         printf(
             '<div class="requires"><p>%1$s</p><p>%2$s</p></div>',
             $requires,
-            $dependency_note
+            $notice
         );
     }

trunk/src/wp-includes/class-wp-plugin-dependencies.php

@@ -370 +370 @@
     public static function display_admin_notice_for_unmet_dependencies() {
         if ( in_array( false, self::get_dependency_filepaths(), true ) ) {
+            $error_message = __( 'Some required plugins are missing or inactive.' );
+
+            if ( is_multisite() ) {
+                if ( current_user_can( 'manage_network_plugins' ) ) {
+                    $error_message .= ' ' . sprintf(
+                        /* translators: %s: Link to the network plugins page. */
+                        __( '<a href="%s">Manage plugins</a>.' ),
+                        esc_url( network_admin_url( 'plugins.php' ) )
+                    );
+                } else {
+                    $error_message .= ' ' . __( 'Please contact your network administrator.' );
+                }
+            } elseif ( 'plugins' !== get_current_screen()->base ) {
+                $error_message .= ' ' . sprintf(
+                    /* translators: %s: Link to the plugins page. */
+                    __( '<a href="%s">Manage plugins</a>.' ),
+                    esc_url( admin_url( 'plugins.php' ) )
+                );
+            }
+
             wp_admin_notice(
-                __( 'There are additional plugin dependencies that must be installed.' ),
+                $error_message,
                 array(
-                    'type' => 'info',
+                    'type' => 'warning',
                 )
             );