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

Timestamp:

09/17/2016 09:49:49 PM (7 years ago)

Author:

westonruter

Message:

Customize: Ensure nav menu items lacking a label use the title from the original object.

Use original title as placeholder for label and in control title. Prevent original title from overriding empty label in initial setting values.

Fixes #38015.

File:

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

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

@@ -234 +234 @@
                 $value = $post_value;
             }
-        } else if ( isset( $this->value ) ) {
+        } elseif ( isset( $this->value ) ) {
             $value = $this->value;
         } else {
@@ -243 +243 @@
                 $post = get_post( $this->post_id );
                 if ( $post && self::POST_TYPE === $post->post_type ) {
+                    $is_title_empty = empty( $post->post_title );
                     $value = (array) wp_setup_nav_menu_item( $post );
+                    if ( $is_title_empty ) {
+                        $value['title'] = '';
+                    }
                 }
             }
@@ -261 +265 @@
 
     /**
+     * Get original title.
+     *
+     * @since 4.7.0
+     *
+     * @param object $item Nav menu item.
+     * @return string The original title.
+     */
+    protected function get_original_title( $item ) {
+        if ( empty( $item->object_id ) ) {
+            return '';
+        }
+        $original_title = '';
+        if ( 'post_type' === $item->type ) {
+            $original_object = get_post( $item->object_id );
+            if ( $original_object ) {
+                /** This filter is documented in wp-includes/post-template.php */
+                $original_title = apply_filters( 'the_title', $original_object->post_title, $original_object->ID );
+
+                if ( '' === $original_title ) {
+                    /* translators: %d: ID of a post */
+                    $original_title = sprintf( __( '#%d (no title)' ), $original_object->ID );
+                }
+            }
+        } elseif ( 'taxonomy' === $item->type ) {
+            $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;
+            }
+        }
+        $original_title = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+        return $original_title;
+    }
+
+    /**
      * Ensure that the value is fully populated with the necessary properties.
      *
@@ -285 +323 @@
 
         if ( ! isset( $this->value['original_title'] ) ) {
-            $original_title = '';
-            if ( 'post_type' === $this->value['type'] ) {
-                $original_title = get_the_title( $this->value['object_id'] );
-            } elseif ( 'taxonomy' === $this->value['type'] ) {
-                $original_title = get_term_field( 'name', $this->value['object_id'], $this->value['object'], 'raw' );
-                if ( is_wp_error( $original_title ) ) {
-                    $original_title = '';
-                }
-            }
-            $this->value['original_title'] = html_entity_decode( $original_title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+            $this->value['original_title'] = $this->get_original_title( (object) $this->value );
         }
 
@@ -535 +564 @@
         unset( $item->position );
 
+        if ( empty( $item->original_title ) ) {
+            $item->original_title = $this->get_original_title( $item );
+        }
+        if ( empty( $item->title ) && ! empty( $item->original_title ) ) {
+            $item->title = $item->original_title;
+        }
         if ( $item->title ) {
             $item->post_title = $item->title;
@@ -555 +590 @@
                     $post->type_label = $post->object;
                 }
-            } elseif ( 'taxonomy' == $post->type ) {
+            } elseif ( 'taxonomy' === $post->type ) {
                 $object = get_taxonomy( $post->object );
                 if ( $object ) {