Changeset 39393 for trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

Timestamp:

11/30/2016 11:35:34 PM (10 years ago)

Author:

westonruter

Message:

Customize: Fix handling of the nav menu item labels (titles) that match defaults (original titles) and fix the display of item type labels.

• Show default labels for nav menu item as placeholders in a control's label field instead of showing blank.
• Store empty string as label instead of copying default labels.
• Prevent labels for post type archive items from being dropped in preview.
• Also ensure that the item type label is displayed on nav menu item controls for settings that are loaded from an existing changeset.

Amends [38618].
See #38015.
Fixes #38955.

File:

• trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php (modified) (5 diffs)

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -234 +234 @@
                                 $value = $post_value;
                         }
+                        if ( ! empty( $value ) && empty( $value['original_title'] ) ) {
+                                $value['original_title'] = $this->get_original_title( (object) $value );
+                        }
                 } elseif ( isset( $this->value ) ) {
                         $value = $this->value;
@@ -261 +264 @@
                 }
 
+                if ( ! empty( $value ) && empty( $value['type_label'] ) ) {
+                        $value['type_label'] = $this->get_type_label( (object) $value );
+                }
+
                 return $value;
         }
@@ -274 +281 @@
          */
         protected function get_original_title( $item ) {
-                if ( empty( $item->object_id ) ) {
-                        return '';
-                }
                 $original_title = '';
-                if ( 'post_type' === $item->type ) {
+                if ( 'post_type' === $item->type && ! empty( $item->object_id ) ) {
                         $original_object = get_post( $item->object_id );
                         if ( $original_object ) {
@@ -289 +293 @@
                                 }
                         }
-                } elseif ( 'taxonomy' === $item->type ) {
+                } elseif ( 'taxonomy' === $item->type && ! empty( $item->object_id ) ) {
                         $original_term_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
                         if ( ! is_wp_error( $original_term_title ) ) {
                                 $original_title = $original_term_title;
                         }
+                } elseif ( 'post_type_archive' === $item->type ) {
+                        $original_object = get_post_type_object( $item->object );
+                        if ( $original_object ) {
+                                $original_title = $original_object->labels->archives;
+                        }
                 }
                 $original_title = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
                 return $original_title;
+        }
+
+        /**
+         * Get type label.
+         *
+         * @since 4.7.0
+         * @access protected
+         *
+         * @param object $item Nav menu item.
+         * @returns string The type label.
+         */
+        protected function get_type_label( $item ) {
+                if ( 'post_type' === $item->type ) {
+                        $object = get_post_type_object( $item->object );
+                        if ( $object ) {
+                                $type_label = $object->labels->singular_name;
+                        } else {
+                                $type_label = $item->object;
+                        }
+                } elseif ( 'taxonomy' === $item->type ) {
+                        $object = get_taxonomy( $item->object );
+                        if ( $object ) {
+                                $type_label = $object->labels->singular_name;
+                        } else {
+                                $type_label = $item->object;
+                        }
+                } elseif ( 'post_type_archive' === $item->type ) {
+                        $type_label = __( 'Post Type Archive' );
+                } else {
+                        $type_label = __( 'Custom Link' );
+                }
+                return $type_label;
         }
 
@@ -585 +626 @@
 
                 if ( ! isset( $post->type_label ) ) {
-                        if ( 'post_type' === $post->type ) {
-                                $object = get_post_type_object( $post->object );
-                                if ( $object ) {
-                                        $post->type_label = $object->labels->singular_name;
-                                } else {
-                                        $post->type_label = $post->object;
-                                }
-                        } elseif ( 'taxonomy' === $post->type ) {
-                                $object = get_taxonomy( $post->object );
-                                if ( $object ) {
-                                        $post->type_label = $object->labels->singular_name;
-                                } else {
-                                        $post->type_label = $post->object;
-                                }
-                        } else {
-                                $post->type_label = __( 'Custom Link' );
-                        }
+                        $post->type_label = $this->get_type_label( $post );
                 }