From dce0b9adea9caf99ce2f831f72e29024565a3f76 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 8 Mar 2014 04:14:15 +0000 Subject: [PATCH] Use SSL when linking to WordPress.org. see #27115. Built from https://develop.svn.wordpress.org/trunk@27469 git-svn-id: http://core.svn.wordpress.org/trunk@27314 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-footer.php | 3 ++- wp-admin/comment.php | 2 +- wp-admin/credits.php | 4 ++-- wp-admin/custom-background.php | 2 +- wp-admin/custom-header.php | 2 +- wp-admin/edit-form-advanced.php | 6 +++--- wp-admin/edit-link-form.php | 2 +- wp-admin/edit.php | 4 ++-- wp-admin/export.php | 2 +- wp-admin/freedoms.php | 8 ++++---- wp-admin/import.php | 2 +- wp-admin/index.php | 2 +- wp-admin/install.php | 4 ++-- wp-admin/link-manager.php | 2 +- wp-admin/maint/repair.php | 4 ++-- wp-admin/media-new.php | 2 +- wp-admin/media.php | 2 +- wp-admin/my-sites.php | 2 +- wp-admin/nav-menus.php | 2 +- wp-admin/network/index.php | 2 +- wp-admin/network/settings.php | 2 +- wp-admin/network/site-info.php | 2 +- wp-admin/network/site-new.php | 2 +- wp-admin/network/site-settings.php | 2 +- wp-admin/network/site-themes.php | 2 +- wp-admin/network/site-users.php | 2 +- wp-admin/network/sites.php | 2 +- wp-admin/network/themes.php | 2 +- wp-admin/network/upgrade.php | 2 +- wp-admin/network/user-new.php | 2 +- wp-admin/network/users.php | 2 +- wp-admin/options-discussion.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-media.php | 2 +- wp-admin/options-permalink.php | 2 +- wp-admin/options-reading.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/plugin-editor.php | 2 +- wp-admin/plugin-install.php | 4 ++-- wp-admin/plugins.php | 4 ++-- wp-admin/revision.php | 2 +- wp-admin/setup-config.php | 2 +- wp-admin/theme-install.php | 4 ++-- wp-admin/themes.php | 4 ++-- wp-admin/tools.php | 2 +- wp-admin/update-core.php | 2 +- wp-admin/upgrade.php | 2 +- wp-admin/upload.php | 2 +- wp-admin/user-edit.php | 2 +- wp-admin/user-new.php | 2 +- wp-admin/widgets.php | 2 +- 51 files changed, 65 insertions(+), 64 deletions(-) diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php index df974d6f83..0619c86292 100644 --- a/wp-admin/admin-footer.php +++ b/wp-admin/admin-footer.php @@ -26,6 +26,7 @@ if ( !defined('ABSPATH') ) ?>

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

' . '

' . __( 'Documentation on Comments' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Support Forums' ) . '

' ); wp_enqueue_script('comment'); diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 950332057c..6d4eae1064 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -102,7 +102,7 @@ $credits = wp_credits(); if ( ! $credits ) { echo '

' . sprintf( __( 'WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress.' ), - 'http://wordpress.org/about/', + 'https://wordpress.org/about/', /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */ __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '

'; include( ABSPATH . 'wp-admin/admin-footer.php' ); @@ -161,7 +161,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { ?>

Get involved in WordPress.' ), /* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */ - __( 'http://make.wordpress.org/' ) ); ?>

+ __( 'https://make.wordpress.org/' ) ); ?>

set_help_sidebar( '

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

' . '

' . __( 'Documentation on Custom Background' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Support Forums' ) . '

' ); wp_enqueue_media(); diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 633dc6586e..1a3db1a4a5 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -131,7 +131,7 @@ class Custom_Image_Header { get_current_screen()->set_help_sidebar( '

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

' . '

' . __( 'Documentation on Custom Header' ) . '

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Support Forums' ) . '

' ); } diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 40afa7b78c..f10490e21f 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -274,7 +274,7 @@ if ( 'post' == $post_type ) { '

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

' . '

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('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.') . '

' . @@ -290,7 +290,7 @@ if ( 'post' == $post_type ) { '

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

' . '

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('Support Forums') . '

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

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('Support Forums') . '

' ); } diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index d4a38cab56..007146c817 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -63,7 +63,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

' . '

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

' . - '

' . __( 'Support Forums' ) . '

' + '

' . __( 'Support Forums' ) . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index e98da90ff1..a062b0911a 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -197,7 +197,7 @@ if ( 'post' == $post_type ) { get_current_screen()->set_help_sidebar( '

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('Support Forums') . '

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

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('Support Forums') . '

' ); } diff --git a/wp-admin/export.php b/wp-admin/export.php index e0811c324d..1ad91a06a9 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -53,7 +53,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

' . '

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

' . - '

' . __('Support Forums') . '

' + '

' . __('Support Forums') . '

' ); if ( isset( $_GET['download'] ) ) { diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index a020a85d89..fa6728a0a2 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -33,7 +33,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); -

license, the GPL.' ), 'http://wordpress.org/about/license/' ); ?>

+

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>

    2. @@ -46,10 +46,10 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

    plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'http://wordpress.org/about/license/' ); ?>

    +printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?>

    Free Software Foundation.' ); ?>

    diff --git a/wp-admin/import.php b/wp-admin/import.php index 7e7c0915a2..e6f05e0eb3 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -26,7 +26,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( current_user_can( 'install_plugins' ) ) diff --git a/wp-admin/index.php b/wp-admin/index.php index c80d006062..3bd4c7c012 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -86,7 +86,7 @@ unset( $help ); $screen->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support Forums' ) . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/install.php b/wp-admin/install.php index ff14e7a531..6d2f833a52 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -16,7 +16,7 @@ if ( false ) { Error: PHP is not running -

    WordPress

    +

    WordPress

    Error: PHP is not running

    WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.

    @@ -62,7 +62,7 @@ function display_header() { ?> -

    +

    add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php index 7691e7cd7a..361229f555 100644 --- a/wp-admin/maint/repair.php +++ b/wp-admin/maint/repair.php @@ -22,7 +22,7 @@ header( 'Content-Type: text/html; charset=utf-8' ); ?> -

    +

    ' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.') . '

    ', __( 'http://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); + printf( '

    ' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the WordPress support forums to get additional assistance.') . '

    ', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) ); $problem_output = ''; foreach ( $problems as $table => $problem ) $problem_output .= "$table: $problem\n"; diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php index 75f49f1008..ac96e8a118 100644 --- a/wp-admin/media-new.php +++ b/wp-admin/media-new.php @@ -54,7 +54,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/media.php b/wp-admin/media.php index 1462f7d42a..7920bef917 100644 --- a/wp-admin/media.php +++ b/wp-admin/media.php @@ -81,7 +81,7 @@ case 'edit' : get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php index 2b97eef37a..feed16aee6 100644 --- a/wp-admin/my-sites.php +++ b/wp-admin/my-sites.php @@ -46,7 +46,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on My Sites') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 1ec8462bfb..77a4057a75 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -526,7 +526,7 @@ endif; get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); // Get the admin header diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php index dbf71f702b..bd6437e7f0 100644 --- a/wp-admin/network/index.php +++ b/wp-admin/network/index.php @@ -51,7 +51,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on the Network Admin') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); wp_dashboard_setup(); diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index 2b3b9a6cf3..3497ddb007 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -35,7 +35,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Network Settings') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( $_POST ) { diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index 6607b8fe1c..1034af1478 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -30,7 +30,7 @@ if ( ! current_user_can( 'manage_sites' ) ) get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index 8765ab98c3..6a6cac993f 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -27,7 +27,7 @@ if ( ! current_user_can( 'manage_sites' ) ) get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php index 5e1ffdd9e5..aeca875e50 100644 --- a/wp-admin/network/site-settings.php +++ b/wp-admin/network/site-settings.php @@ -30,7 +30,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 646eb08a28..6739ac4c33 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -30,7 +30,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 322400bab5..4dbf6f1f5a 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -33,7 +33,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index 85db8d7e59..4dddfcfda3 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -43,7 +43,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Site Management') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index aada6edb70..230463f328 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -212,7 +212,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Network Themes') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $title = __('Themes'); diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php index 6788ab5473..15a5b74a98 100644 --- a/wp-admin/network/upgrade.php +++ b/wp-admin/network/upgrade.php @@ -30,7 +30,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Upgrade Network') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php index 04ef34a0a4..29fd63dab5 100644 --- a/wp-admin/network/user-new.php +++ b/wp-admin/network/user-new.php @@ -27,7 +27,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Network Users') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) { diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index 39e8168124..4eaa8873ab 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -241,7 +241,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Network Users') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index a02f997097..c1506fd945 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -24,7 +24,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Discussion Settings') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 793fdb05b7..38f20c5800 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -77,7 +77,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on General Settings') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index 770d799de1..651b08dd20 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -32,7 +32,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 63ddc551df..c492e2c00e 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -43,7 +43,7 @@ get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Permalinks Settings') . '

    ' . '

    ' . __('Documentation on Using Permalinks') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); /** diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 9c3e866077..7bcb20be61 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -69,7 +69,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Reading Settings') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 7810b2907e..301120cb94 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -55,7 +55,7 @@ if ( apply_filters( 'enable_update_services_configuration', true ) ) { get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Writing Settings') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index ff962b8b55..33cb05bcfb 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -132,7 +132,7 @@ default: '

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

    ' . '

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

    ' . '

    ' . __('Documentation on Writing Plugins') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once(ABSPATH . 'wp-admin/admin-header.php'); diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index 8d0dde3269..b87193977f 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -49,7 +49,7 @@ get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => - '

    ' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/plugins/') . '

    ' + '

    ' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official WordPress.org Plugin Directory are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'adding-plugins', @@ -64,7 +64,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Installing Plugins') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); /** diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 32b77ed829..9c3aa457f1 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -344,7 +344,7 @@ get_current_screen()->add_help_tab( array( 'title' => __('Overview'), 'content' => '

    ' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '

    ' . - '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/plugins/') . '

    ' + '

    ' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'https://wordpress.org/plugins/') . '

    ' ) ); get_current_screen()->add_help_tab( array( 'id' => 'compatibility-problems', @@ -357,7 +357,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $title = __('Plugins'); diff --git a/wp-admin/revision.php b/wp-admin/revision.php index 7a201a4e9c..e4cc0c7d99 100644 --- a/wp-admin/revision.php +++ b/wp-admin/revision.php @@ -117,7 +117,7 @@ get_current_screen()->add_help_tab( array( $revisions_sidebar = '

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

    '; $revisions_sidebar .= '

    ' . __( 'Revisions Management' ) . '

    '; -$revisions_sidebar .= '

    ' . __( 'Support Forums' ) . '

    '; +$revisions_sidebar .= '

    ' . __( 'Support Forums' ) . '

    '; get_current_screen()->set_help_sidebar( $revisions_sidebar ); diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 8efd0efaff..2b5b7f89fb 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -103,7 +103,7 @@ function setup_config_display_header() { -

    +

    ' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'http://wordpress.org/themes/') . '

    ' . + '

    ' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '

    ' . '

    ' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '

    ' . '

    ' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory.') . '

    '; @@ -69,7 +69,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include(ABSPATH . 'wp-admin/admin-header.php'); diff --git a/wp-admin/themes.php b/wp-admin/themes.php index 5fbfeb0056..ea06aa8c71 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -56,7 +56,7 @@ if ( current_user_can( 'install_themes' ) ) { if ( is_multisite() ) { $help_install = '

    ' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '

    '; } else { - $help_install = '

    ' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'http://wordpress.org/themes/' ) . '

    '; + $help_install = '

    ' . sprintf( __('If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress.org Theme Directory. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!'), 'https://wordpress.org/themes/' ) . '

    '; } get_current_screen()->add_help_tab( array( @@ -83,7 +83,7 @@ if ( current_user_can( 'edit_theme_options' ) ) { get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __( 'Documentation on Using Themes' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support Forums' ) . '

    ' ); if ( current_user_can( 'switch_themes' ) ) { diff --git a/wp-admin/tools.php b/wp-admin/tools.php index b55328a763..afc65d9099 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -26,7 +26,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Tools') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index aa2d19bdf2..a8a7aa9909 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -485,7 +485,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __( 'Documentation on Updating WordPress' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support Forums' ) . '

    ' ); if ( 'upgrade-core' == $action ) { diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 675a901d3a..10c04131a5 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -59,7 +59,7 @@ else ?> -

    +

    diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 8b93f825a0..c38a0b6356 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -168,7 +168,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( 'Support Forums' ) . '

    ' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index e35c879568..7274f4da2d 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -51,7 +51,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on User Profiles') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); $wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer ); diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 400e789222..2b8583ce45 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -182,7 +182,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); wp_enqueue_script('wp-ajax-response'); diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 8dc99bd365..b861b38928 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -70,7 +70,7 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Widgets') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( ! current_theme_supports( 'widgets' ) ) {