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

Timestamp:

09/17/2023 03:21:07 PM (3 years ago)

Author:

costdev

Message:

Administration: Use wp_admin_notice() more in /wp-admin/includes/.

Adds further usages of wp_admin_notice() in /wp-admin/includes/ on .notice-error, .notice-warning, .error, and .updated.

Ongoing task to implement new function across core.

Follow-up to [56408], [56409], [56410], [56518], [56570], [56571], [56572], [56573], [56576], [56589], [56590], [56597].

Props joedolson, mukesh27, costdev.
See #57791.

File:

• trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (4 diffs)

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

@@ -1283 +1283 @@
                 '<tr class="plugin-update-tr">' .
                 '<td colspan="%s" class="plugin-update colspanchange">' .
-                '<div class="update-message notice inline notice-error notice-alt"><p>',
                 esc_attr( $this->get_column_count() )
             );
 
+            $incompatible_message = '';
             if ( ! $compatible_php && ! $compatible_wp ) {
-                _e( 'This plugin does not work with your versions of WordPress and PHP.' );
+                $incompatible_message .= __( 'This plugin does not work with your versions of WordPress and PHP.' );
                 if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
-                    printf(
+                    $incompatible_message .= sprintf(
                         /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
                         ' ' . __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
@@ -1296 +1296 @@
                         esc_url( wp_get_update_php_url() )
                     );
-                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                    $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
                 } elseif ( current_user_can( 'update_core' ) ) {
-                    printf(
+                    $incompatible_message .= sprintf(
                         /* translators: %s: URL to WordPress Updates screen. */
                         ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
@@ -1304 +1304 @@
                     );
                 } elseif ( current_user_can( 'update_php' ) ) {
-                    printf(
+                    $incompatible_message .= sprintf(
                         /* translators: %s: URL to Update PHP page. */
                         ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
                         esc_url( wp_get_update_php_url() )
                     );
-                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                    $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
                 }
             } elseif ( ! $compatible_wp ) {
-                _e( 'This plugin does not work with your version of WordPress.' );
+                $incompatible_message .= __( 'This plugin does not work with your version of WordPress.' );
                 if ( current_user_can( 'update_core' ) ) {
-                    printf(
+                    $incompatible_message .= sprintf(
                         /* translators: %s: URL to WordPress Updates screen. */
                         ' ' . __( '<a href="%s">Please update WordPress</a>.' ),
@@ -1321 +1321 @@
                 }
             } elseif ( ! $compatible_php ) {
-                _e( 'This plugin does not work with your version of PHP.' );
+                $incompatible_message .= __( 'This plugin does not work with your version of PHP.' );
                 if ( current_user_can( 'update_php' ) ) {
-                    printf(
+                    $incompatible_message .= sprintf(
                         /* translators: %s: URL to Update PHP page. */
                         ' ' . __( '<a href="%s">Learn more about updating PHP</a>.' ),
                         esc_url( wp_get_update_php_url() )
                     );
-                    wp_update_php_annotation( '</p><p><em>', '</em>' );
+                    $incompatible_message .= wp_update_php_annotation( '</p><p><em>', '</em>', false );
                 }
             }
 
-            echo '</p></div></td></tr>';
+            wp_admin_notice(
+                $incompatible_message,
+                array(
+                    'type'               => 'error',
+                    'additional_classes' => array( 'notice-alt', 'inline', 'update-message' ),
+                )
+            );
+
+            echo '</td></tr>';
         }