WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Administration: Adjust code for "Manage widgets or menus" item on "Welcome to WordPress" panel to avoid an extra space after [42343]. 

Props Presskopp, davidbaumwald.
Fixes #47536.
Built from https://develop.svn.wordpress.org/trunk@45536


git-svn-id: http://core.svn.wordpress.org/trunk@45347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-06-14 00:29:52 +00:00
parent 3d61f81536
commit 0239fe6d10
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/includes/dashboard.php
View File

@ -1717,22 +1717,21 @@ function wp_welcome_panel() {
<div class="welcome-panel-column welcome-panel-last"> <div class="welcome-panel-column welcome-panel-last">
<h3><?php _e( 'More Actions' ); ?></h3> <h3><?php _e( 'More Actions' ); ?></h3>
<ul> <ul>
<?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
<li><div class="welcome-icon welcome-widgets-menus">
<?php <?php
if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) :
if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) { if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
printf( $widgets_menus_link = sprintf(
__( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ), __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
admin_url( 'widgets.php' ), admin_url( 'widgets.php' ),
admin_url( 'nav-menus.php' ) admin_url( 'nav-menus.php' )
); );
} elseif ( current_theme_supports( 'widgets' ) ) { } elseif ( current_theme_supports( 'widgets' ) ) {
echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>'; $widgets_menus_link = '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
} else { } else {
echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>'; $widgets_menus_link = '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
} }
?> ?>
</div></li> <li><div class="welcome-icon welcome-widgets-menus"><?php echo $widgets_menus_link; ?></div></li>
<?php endif; ?> <?php endif; ?>
<?php if ( current_user_can( 'manage_options' ) ) : ?> <?php if ( current_user_can( 'manage_options' ) ) : ?>
<li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li> <li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45535'; $wp_version = '5.3-alpha-45536';
/** /**
* 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.