diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 75c3cef2f2..540f1edab2 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -378,8 +378,8 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . sprintf(__('You can also create posts with the Press This bookmarklet.'), 'tools.php') . '

' . '

' . __('For more information:') . '

' . - '

' . __('Documentation on Writing and Editing Posts') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Writing and Editing Posts') . '

' . + '

' . __('Support Forums') . '

' ); } elseif ( 'page' == $post_type ) { $about_pages = '

' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the “Parent” of the other, creating a group of pages.') . '

' . @@ -393,9 +393,9 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Adding New Pages') . '

' . - '

' . __('Documentation on Editing Pages') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Adding New Pages') . '

' . + '

' . __('Documentation on Editing Pages') . '

' . + '

' . __('Support Forums') . '

' ); } elseif ( 'attachment' == $post_type ) { get_current_screen()->add_help_tab( array( @@ -410,8 +410,8 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Edit Media') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Edit Media') . '

' . + '

' . __('Support Forums') . '

' ); } diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index ff02e394cf..e25841d3d2 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -57,13 +57,13 @@ get_current_screen()->add_help_tab( array( 'content' => '

' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields.' ) . '

' . '

' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '

' . - '

' . __( 'XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '

' + '

' . __( 'XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '

' ) ); get_current_screen()->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Creating Links' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Creating Links' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index b048103a57..c22712e333 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -299,13 +299,13 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t $help = '

' . __( 'For more information:' ) . '

'; if ( 'category' == $taxonomy ) - $help .= '

' . __( 'Documentation on Categories' ) . '

'; + $help .= '

' . __( 'Documentation on Categories' ) . '

'; elseif ( 'link_category' == $taxonomy ) - $help .= '

' . __( 'Documentation on Link Categories' ) . '

'; + $help .= '

' . __( 'Documentation on Link Categories' ) . '

'; else - $help .= '

' . __( 'Documentation on Tags' ) . '

'; + $help .= '

' . __( 'Documentation on Tags' ) . '

'; - $help .= '

' . __('Support Forums') . '

'; + $help .= '

' . __('Support Forums') . '

'; get_current_screen()->set_help_sidebar( $help ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 120140a144..820c7082bc 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -173,7 +173,7 @@ if ( $doaction ) { * * @param string $sendback The redirect URL. * @param string $doaction The action being taken. - * @param array $post_ids The post IDs to take the action on. + * @param array $post_ids The post IDs to take the action on. */ $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $post_ids ); break; @@ -236,8 +236,8 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Posts') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Managing Posts') . '

' . + '

' . __('Support Forums') . '

' ); } elseif ( 'page' == $post_type ) { @@ -257,8 +257,8 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Pages') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Managing Pages') . '

' . + '

' . __('Support Forums') . '

' ); } diff --git a/wp-admin/export.php b/wp-admin/export.php index ebf5a910ea..c1d4d8b529 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -51,8 +51,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Export') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Export') . '

' . + '

' . __('Support Forums') . '

' ); // If the 'download' URL parameter is set, a WXR export file is baked and returned. diff --git a/wp-admin/import.php b/wp-admin/import.php index 5183766230..1aa682ae9b 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -26,8 +26,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Import') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Import') . '

' . + '

' . __('Support Forums') . '

' ); if ( current_user_can( 'install_plugins' ) ) { diff --git a/wp-admin/index.php b/wp-admin/index.php index 86bed0adfc..6e31f8b718 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -95,8 +95,8 @@ unset( $help ); $screen->set_help_sidebar( '

' . __( 'For more information:' ) . '

' . - '

' . __( 'Documentation on Dashboard' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Documentation on Dashboard' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 3937fd7f3d..f37ff6993e 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -74,8 +74,8 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Managing Links') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Managing Links') . '

' . + '

' . __('Support Forums') . '

' ); get_current_screen()->set_screen_reader_content( array( diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php index 86d8810a9c..75ddb16b3f 100644 --- a/wp-admin/media-new.php +++ b/wp-admin/media-new.php @@ -53,8 +53,8 @@ get_current_screen()->add_help_tab( array( ) ); get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Uploading Media Files') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Uploading Media Files') . '

' . + '

' . __('Support Forums') . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/media.php b/wp-admin/media.php index 88fa51ed48..3fbb9265d5 100644 --- a/wp-admin/media.php +++ b/wp-admin/media.php @@ -80,8 +80,8 @@ case 'edit' : get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Edit Media') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Edit Media') . '

' . + '

' . __('Support Forums') . '

' ); require( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 319566c424..6ff1587925 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -567,8 +567,8 @@ endif; get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Menus') . '

' . - '

' . __('Support Forums') . '

' + '

' . __('Documentation on Menus') . '

' . + '

' . __('Support Forums') . '

' ); // Get the admin header. diff --git a/wp-includes/version.php b/wp-includes/version.php index 2d20327907..e36e8308dc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38724'; +$wp_version = '4.7-alpha-38725'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.