Ticket #17609: 17609.diff

wp-admin/edit-form-advanced.php

@@ -28 +28 @@
 $action = isset($action) ? $action : '';
 
 $messages = array();
-$messages['post'] = array(
+$screen = get_current_screen();
+$obj = get_post_type_object( $screen->post_type );
+$label = $obj->labels->singular_name;
+$links = array(
+        'permalink' => '',
+        'preview'   => ''
+);
+if ( $obj->publicly_queryable ) {
+        $permalink = get_permalink( $post_ID );
+        $links = array(
+                'permalink' => '<a href="' . esc_url( $permalink ) . '">' . sprintf( esc_html__( 'View %1$s' ), $label ) . '</a>',
+                'preview'   => '<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', $permalink ) ) . '">' . sprintf( esc_html__( 'Preview %1$s' ), $label ) . '</a>'
+        );
+}
+$messages[$screen->post_type] = array(
          0 => '', // Unused. Messages start at index 1.
-         1 => sprintf( __('Post updated. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
-         2 => __('Custom field updated.'),
-         3 => __('Custom field deleted.'),
-         4 => __('Post updated.'),
+         1 => sprintf( __( '%1$s updated. %2$s' ), $label, $links['permalink'] ),
+         2 => __( 'Custom field updated.' ),
+         3 => __( 'Custom field deleted.' ),
+         4 => sprintf( __( '%1$s updated.' ), $label ),
         /* translators: %s: date and time of the revision */
-         5 => isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-         6 => sprintf( __('Post published. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
-         7 => __('Post saved.'),
-         8 => sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
-         9 => sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
+         5 => isset( $_GET['revision'] ) ? sprintf( __( '%1$s restored to revision from %2$s' ), $label, wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+         6 => sprintf( __( '%1$s published. %2$s' ), $label, $links['permalink'] ),
+         7 => sprintf( __( '%1$s saved.' ), $label ),
+         8 => sprintf( __( '%1$s submitted. %2$s' ), $label, $links['preview'] ),
+         9 => sprintf( __( '%1$s scheduled for: <strong>%2$s</strong>. %s' ),
+                $label,
                 // translators: Publish box date format, see http://php.net/date
                 date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
-        10 => sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+        10 => sprintf( __( '%1$s draft updated. %2$s'), $label, $links['preview'] ),
 );
-$messages['page'] = array(
-         0 => '', // Unused. Messages start at index 1.
-         1 => sprintf( __('Page updated. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
-         2 => __('Custom field updated.'),
-         3 => __('Custom field deleted.'),
-         4 => __('Page updated.'),
-         5 => isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-         6 => sprintf( __('Page published. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
-         7 => __('Page saved.'),
-         8 => sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
-         9 => sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
-        10 => sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
-);
-
+$messages[$screen->post_type] = array_map( 'trim', $messages[$screen->post_type] );
 $messages = apply_filters( 'post_updated_messages', $messages );
 
 $message = false;