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.


git-svn-id: https://develop.svn.wordpress.org/trunk@38618 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter
2016-09-17 21:49:49 +00:00
parent 998c06222f
commit 87dc042623
5 changed files with 116 additions and 16 deletions
@@ -184,6 +184,34 @@ class Test_WP_Customize_Nav_Menu_Item_Setting extends WP_UnitTestCase {
$this->assertEquals( $other_menu_id, $value['nav_menu_term_id'] );
}
/**
* Test value method with post without nav menu item title (label).
*
* @see WP_Customize_Nav_Menu_Item_Setting::value()
*/
function test_value_type_post_type_without_label() {
do_action( 'customize_register', $this->wp_customize );
$original_title = 'Hello World';
$post_id = self::factory()->post->create( array( 'post_title' => $original_title ) );
$menu_id = wp_create_nav_menu( 'Menu' );
$item_id = wp_update_nav_menu_item( $menu_id, 0, array(
'menu-item-type' => 'post_type',
'menu-item-object' => 'post',
'menu-item-object-id' => $post_id,
'menu-item-title' => '',
'menu-item-status' => 'publish',
) );
$setting_id = "nav_menu_item[$item_id]";
$setting = new WP_Customize_Nav_Menu_Item_Setting( $this->wp_customize, $setting_id );
$value = $setting->value();
$this->assertEquals( '', $value['title'] );
$this->assertEquals( $original_title, $value['original_title'] );
}
/**
* Test value method with taxonomy.
*
@@ -804,4 +832,37 @@ class Test_WP_Customize_Nav_Menu_Item_Setting extends WP_UnitTestCase {
$this->assertEquals( $expected, $nav_menu_item->attr_title );
$this->assertEquals( 'Attempted \o/ o’o markup', $nav_menu_item->description );
}
/**
* Test WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item() where title is empty.
*
* @ticket 38015
* @see WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item()
*/
function test_value_as_wp_post_nav_menu_item_with_empty_title() {
$original_title = 'The Original Title';
$post_id = self::factory()->post->create( array( 'post_title' => $original_title ) );
$setting = new WP_Customize_Nav_Menu_Item_Setting(
$this->wp_customize,
'nav_menu_item[123]'
);
$post_value = array_merge(
$setting->default,
array(
'object_id' => $post_id,
'object' => 'post',
'type' => 'post_type',
'status' => 'publish',
'nav_menu_term_id' => 0,
)
);
$this->wp_customize->set_post_value( $setting->id, $post_value );
$setting->preview();
$nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
$this->assertEquals( $original_title, $nav_menu_item->title );
}
}