diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index 19c6bf2266..0fcc52e78c 100644
a
|
b
|
|
245 | 245 | top: -1px; |
246 | 246 | } |
247 | 247 | |
| 248 | .welcome-panel .welcome-setup-home:before { |
| 249 | content: "\f102"; |
| 250 | top: -1px; |
| 251 | } |
| 252 | |
248 | 253 | .welcome-panel .welcome-view-site:before { |
249 | 254 | content: "\f115"; |
250 | 255 | top: -2px; |
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
index 5ab4cac567..b0827af69a 100644
a
|
b
|
if ( current_user_can( $tax->cap->edit_terms ) ) { |
581 | 581 | <div class="form-wrap edit-term-notes"> |
582 | 582 | <p> |
583 | 583 | <?php |
| 584 | echo '<strong>' . __( 'Note:' ) . '</strong><br />'; |
584 | 585 | printf( |
585 | 586 | /* translators: %s: default category */ |
586 | 587 | __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ), |
… |
… |
if ( current_user_can( $tax->cap->edit_terms ) ) { |
590 | 591 | ?> |
591 | 592 | </p> |
592 | 593 | <?php if ( current_user_can( 'import' ) ) : ?> |
593 | | <p> |
594 | | <?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ); ?> |
595 | | </p> |
| 594 | <p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ); ?></p> |
596 | 595 | <?php endif; ?> |
597 | 596 | </div> |
598 | 597 | <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?> |
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
index 5b13f686a1..12ed7196e1 100644
a
|
b
|
function wp_welcome_panel() { |
1749 | 1749 | <?php else : ?> |
1750 | 1750 | <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li> |
1751 | 1751 | <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li> |
| 1752 | <li><?php printf( '<a href="%s" class="welcome-icon welcome-setup-home">' . __( 'Setup your homepage' ) . '</a>', current_user_can( 'customize' ) ? add_query_arg( 'autofocus[section]', 'static_front_page', admin_url( 'customize.php' ) ) : admin_url( 'options-reading.php' ) ); ?></li> |
1752 | 1753 | <?php endif; ?> |
1753 | 1754 | <li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li> |
1754 | 1755 | </ul> |
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index d6975b2605..f7c8c99699 100644
a
|
b
|
|
1 | 1 | <?php |
2 | 2 | /** |
3 | | * WordPress Version |
4 | | * |
5 | | * Contains version information for the current WordPress release. |
6 | | * |
7 | | * @package WordPress |
8 | | * @since 1.1.0 |
9 | | */ |
10 | | |
11 | | /** |
12 | 3 | * The WordPress version string |
13 | 4 | * |
14 | 5 | * @global string $wp_version |