Changeset 11312

Timestamp:

11/04/2021 06:13:10 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Remove extra placeholder in the title on Edit Plugin screen.

Make sure the title replacement to include the plugin name only runs once in the appropriate context.

Follow-up to [2655], [2829], ​[WP51969].

Props Ipstenu, SergeyBiryukov.
Fixes #5940.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-customizations.php (modified) (2 diffs)
• class-plugin-directory.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -48 +48 @@
         // Admin Metaboxes
         add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 2 );
-        add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ) );
+        add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ), 10, 2 );
 
         add_filter( 'postmeta_form_keys', array( $this, 'postmeta_form_keys' ) );
@@ -70 +70 @@
      * @global string $title The wp-admin title variable.
      *
-     * @param string $post_type The post type of the current page
+     * @param string $post_type The post type of the current page.
+     * @param string $context   Meta box context. Possible values include 'normal', 'advanced', 'side'.
      * @return void.
      */
-    public function replace_title_global( $post_type ) {
+    public function replace_title_global( $post_type, $context ) {
         global $title;
 
-        if ( 'plugin' === $post_type ) {
-            $title = sprintf( $title, get_the_title() ); // esc_html() on output
+        if ( 'plugin' === $post_type && 'normal' === $context ) {
+            $post_type_object = get_post_type_object( $post_type );
+            $title            = sprintf( '%1$s %2$s', $post_type_object->labels->edit_item, get_the_title() ); // esc_html() on output
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -171 +171 @@
 
                 // Context only available in admin, not in toolbar.
-                'edit_item'          => is_admin() ? __( 'Editing Plugin: %s', 'wporg-plugins' ) : __( 'Edit Plugin', 'wporg-plugins' ),
+                'edit_item'          => is_admin() ? __( 'Editing Plugin:', 'wporg-plugins' ) : __( 'Edit Plugin', 'wporg-plugins' ),
             ),
             'description'  => __( 'A Repo Plugin', 'wporg-plugins' ),