Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge two similar strings.

Browse Source 
Props dipesh.kakadiya.
Fixes #33777.
Built from https://develop.svn.wordpress.org/trunk@33998


git-svn-id: http://core.svn.wordpress.org/trunk@33967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-09-10 10:59:27 +00:00
parent 52c3be1602
commit f9e7fb306c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/nav-menu.php
View File

@ -162,7 +162,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
<p class="field-link-target description"> <p class="field-link-target description">
<label for="edit-menu-item-target-<?php echo $item_id; ?>"> <label for="edit-menu-item-target-<?php echo $item_id; ?>">
<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> /> <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
<?php _e( 'Open link in a new window/tab' ); ?> <?php _e( 'Open link in a new tab' ); ?>
</label> </label>
</p> </p>
<p class="field-css-classes description description-thin"> <p class="field-css-classes description description-thin">

2
wp-includes/class-wp-editor.php
View File

@ -1409,7 +1409,7 @@ final class _WP_Editors {
<label><span><?php _e( 'Link Text' ); ?></span><input id="wp-link-text" type="text" /></label> <label><span><?php _e( 'Link Text' ); ?></span><input id="wp-link-text" type="text" /></label>
</div> </div>
<div class="link-target"> <div class="link-target">
<label><span>&nbsp;</span><input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new window/tab' ); ?></label> <label><span>&nbsp;</span><input type="checkbox" id="wp-link-target" /> <?php _e( 'Open link in a new tab' ); ?></label>
</div> </div>
</div> </div>
<p class="howto"><a href="#" id="wp-link-search-toggle"><?php _e( 'Or link to existing content' ); ?></a></p> <p class="howto"><a href="#" id="wp-link-search-toggle"><?php _e( 'Or link to existing content' ); ?></a></p>

2
wp-includes/media-template.php
View File

@ -1005,7 +1005,7 @@ function wp_print_media_templates() {
</div> </div>
<div class="advanced-link"> <div class="advanced-link">
<div class="setting link-target"> <div class="setting link-target">
<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new window/tab' ); ?></label> <label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new tab' ); ?></label>
</div> </div>
<label class="setting link-rel"> <label class="setting link-rel">
<span><?php _e('Link Rel'); ?></span> <span><?php _e('Link Rel'); ?></span>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-33990'; $wp_version = '4.4-alpha-33998';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.