From 0c16c0477bc1c352895a9696dbfabebcdb901c3e Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Mon, 3 Mar 2014 02:34:27 +0000 Subject: [PATCH] Reference https://wordpress.org rather than http://wordpress.org in strings, links, comments, etc. props Ipstenu, markjaquith. see #27115. Built from https://develop.svn.wordpress.org/trunk@27369 git-svn-id: http://core.svn.wordpress.org/trunk@27219 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- license.txt | 2 +- readme.html | 14 +++++++------- wp-admin/edit-comments.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/includes/class-wp-upgrader.php | 4 ++-- wp-admin/includes/media.php | 2 +- wp-admin/includes/plugin-install.php | 12 ++++++------ wp-admin/includes/theme.php | 6 +++--- wp-admin/includes/update.php | 2 +- wp-admin/includes/upgrade.php | 4 ++-- wp-admin/network.php | 2 +- wp-admin/theme-editor.php | 2 +- wp-admin/users.php | 2 +- wp-includes/admin-bar.php | 6 +++--- wp-includes/class-wp-customize-control.php | 2 +- wp-includes/default-widgets.php | 2 +- wp-includes/images/crystal/license.txt | 2 +- wp-includes/media-template.php | 2 +- wp-includes/pluggable-deprecated.php | 2 +- wp-includes/theme-compat/comments-popup.php | 2 +- wp-includes/theme-compat/footer.php | 2 +- wp-includes/theme-compat/sidebar.php | 2 +- wp-includes/update.php | 6 +++--- wp-includes/wp-db.php | 6 +++--- wp-login.php | 2 +- 25 files changed, 46 insertions(+), 46 deletions(-) diff --git a/license.txt b/license.txt index 06c105b129..e7392a053a 100644 --- a/license.txt +++ b/license.txt @@ -382,4 +382,4 @@ WRITTEN OFFER The source code for any program binaries or compressed scripts that are included with WordPress can be freely obtained at the following URL: - http://wordpress.org/download/source/ + https://wordpress.org/download/source/ diff --git a/readme.html b/readme.html index f1256761b7..3688bb3807 100644 --- a/readme.html +++ b/readme.html @@ -8,7 +8,7 @@

- WordPress + WordPress
Version 3.9

Semantic Personal Publishing Platform

@@ -27,7 +27,7 @@
  • Open wp-admin/install.php in your browser.
    • -
  • Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
    • +
  • Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your wp-config.php file, and try again. If it fails again, please go to the support forums with as much data as you can gather.
  • If you did not enter a password, note the password given to you. If you did not provide a username, it will be admin.
  • The installer should then send you to the login page. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on “Profile” to change the password.
    • @@ -60,7 +60,7 @@

    System Recommendations

    Online Resources

    @@ -68,11 +68,11 @@
    The WordPress Codex
    The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
    -
    The WordPress Blog
    +
    The WordPress Blog
    This is where you’ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.
    WordPress Planet
    The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.
    -
    WordPress Support Forums
    +
    WordPress Support Forums
    If you’ve looked everywhere and still can’t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
    WordPress IRC Channel
    There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpress)
    @@ -80,14 +80,14 @@

    Final Notes

    Share the Love

    WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.

    -

    WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

    +

    WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

    License

    WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.

    diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index b12264a02c..a573c40551 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -133,7 +133,7 @@ get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __( 'Documentation on Comment Spam' ) . '

    ' . '

    ' . __( 'Documentation on Keyboard Shortcuts' ) . '

    ' . - '

    ' . __( 'Support Forums' ) . '

    ' + '

    ' . __( '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 56fa11a1c2..14b6ae57c3 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -240,7 +240,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t else $help .= '

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

    '; - $help .= '

    ' . __('Support Forums') . '

    '; + $help .= '

    ' . __('Support Forums') . '

    '; get_current_screen()->set_help_sidebar( $help ); diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 4e1e0c256b..f5fca1c26d 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -2250,7 +2250,7 @@ class WP_Automatic_Updater { // Add a note about the support forums to all emails. $body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' ); - $body .= "\n" . __( 'http://wordpress.org/support/' ); + $body .= "\n" . __( 'https://wordpress.org/support/' ); // If things are successful and we're now on the latest, mention plugins and themes if any are out of date. if ( $type == 'success' && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) { @@ -2387,7 +2387,7 @@ BETA TESTING? This debugging email is sent when you are using a development version of WordPress. If you think these failures might be due to a bug in WordPress, could you report it? - * Open a thread in the support forums: http://wordpress.org/support/forum/alphabeta + * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta * Or, if you're comfortable writing a bug report: http://core.trac.wordpress.org/ Thanks! -- The WordPress Team" ); diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index e31edd7f49..776f310a35 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1687,7 +1687,7 @@ function media_upload_form( $errors = null ) { global $type, $tab, $is_IE, $is_opera; if ( ! _device_can_upload() ) { - echo '

    ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://wordpress.org/mobile/' ) . '

    '; + echo '

    ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'https://wordpress.org/mobile/' ) . '

    '; return; } diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 37d862e0f5..53362d2002 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -74,16 +74,16 @@ function plugins_api($action, $args = null) { $request = wp_remote_post( $url, $args ); if ( $ssl && is_wp_error( $request ) ) { - trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); $request = wp_remote_post( $http_url, $args ); } if ( is_wp_error($request) ) { - $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); + $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); } else { $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); if ( ! is_object( $res ) && ! is_array( $res ) ) - $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); + $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); } } elseif ( !is_wp_error($res) ) { $res->external = true; @@ -126,7 +126,7 @@ function install_popular_tags( $args = array() ) { function install_dashboard() { ?> -

    WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'http://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

    +

    WordPress Plugin Directory or upload a plugin in .zip format via this page.' ), 'https://wordpress.org/plugins/', self_admin_url( 'plugin-install.php?tab=upload' ) ); ?>

    @@ -406,7 +406,7 @@ function install_plugin_information() { downloaded) ) : ?>
  • downloaded), number_format_i18n($api->downloaded)) ?>
    • slug) && empty($api->external) ) : ?> -
    • +
    • homepage) ) : ?>
    • @@ -432,7 +432,7 @@ function install_plugin_information() { else $title = ucwords( str_replace( '_', ' ', $section_name ) ); - $content = links_add_base_url($content, 'http://wordpress.org/plugins/' . $api->slug . '/'); + $content = links_add_base_url($content, 'https://wordpress.org/plugins/' . $api->slug . '/'); $content = links_add_target($content, '_blank'); $san_section = esc_attr( $section_name ); diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index 2d98920484..edfccb0ae5 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -346,16 +346,16 @@ function themes_api( $action, $args = null ) { $request = wp_remote_post( $url, $args ); if ( $ssl && is_wp_error( $request ) ) { - trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); $request = wp_remote_post( $http_url, $args ); } if ( is_wp_error($request) ) { - $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); + $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); } else { $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); if ( ! is_object( $res ) && ! is_array( $res ) ) - $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); + $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); } } diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index cbb9d86df8..4b87d426b8 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -114,7 +114,7 @@ function get_core_checksums( $version, $locale ) { $response = wp_remote_get( $url, $options ); if ( $ssl && is_wp_error( $response ) ) { - trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); $response = wp_remote_get( $http_url, $options ); } diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 5d2e3fc198..db436cbd86 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -170,7 +170,7 @@ function wp_install_defaults( $user_id ) { // Default comment $first_comment_author = __('Mr WordPress'); - $first_comment_url = 'http://wordpress.org/'; + $first_comment_url = 'https://wordpress.org/'; $first_comment = __('Hi, this is a comment. To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.'); if ( is_multisite() ) { @@ -282,7 +282,7 @@ Password: %3\$s We hope you enjoy your new site. Thanks! --The WordPress Team -http://wordpress.org/ +https://wordpress.org/ "), $blog_url, $name, $password); @wp_mail($email, __('New WordPress Site'), $message); diff --git a/wp-admin/network.php b/wp-admin/network.php index eeeb3fb289..a3df828688 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -130,7 +130,7 @@ get_current_screen()->set_help_sidebar( '

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

    ' . '

    ' . __('Documentation on Creating a Network') . '

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); include( ABSPATH . 'wp-admin/admin-header.php' ); diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 8d1775d4d6..382e594a15 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -40,7 +40,7 @@ get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . '

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

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) ); diff --git a/wp-admin/users.php b/wp-admin/users.php index 2a28f74b57..6216453660 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -60,7 +60,7 @@ get_current_screen()->set_help_sidebar( '

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

    ' . '

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

    ' . '

    ' . __('Descriptions of Roles and Capabilities') . '

    ' . - '

    ' . __('Support Forums') . '

    ' + '

    ' . __('Support Forums') . '

    ' ); if ( empty($_REQUEST) ) { diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 67e6a1a5a7..2a5c3b1f84 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -127,7 +127,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'wporg', 'title' => __('WordPress.org'), - 'href' => __('http://wordpress.org/'), + 'href' => __('https://wordpress.org/'), ) ); // Add codex link @@ -143,7 +143,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'support-forums', 'title' => __('Support Forums'), - 'href' => __('http://wordpress.org/support/'), + 'href' => __('https://wordpress.org/support/'), ) ); // Add feedback link @@ -151,7 +151,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) { 'parent' => 'wp-logo-external', 'id' => 'feedback', 'title' => __('Feedback'), - 'href' => __('http://wordpress.org/support/forum/requests-and-feedback'), + 'href' => __('https://wordpress.org/support/forum/requests-and-feedback'), ) ); } diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php index fde8561584..1524666684 100644 --- a/wp-includes/class-wp-customize-control.php +++ b/wp-includes/class-wp-customize-control.php @@ -593,7 +593,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control { */ public function tab_upload_new() { if ( ! _device_can_upload() ) { - echo '

    ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://wordpress.org/mobile/' ) . '

    '; + echo '

    ' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'https://wordpress.org/mobile/' ) . '

    '; } else { ?>
    diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index 6c6e321f54..8863c5dbf5 100644 --- a/wp-includes/default-widgets.php +++ b/wp-includes/default-widgets.php @@ -316,7 +316,7 @@ class WP_Widget_Meta extends WP_Widget {
  • RSS'); ?>
  • RSS'); ?>
    • %s', - esc_url( __( 'http://wordpress.org/' ) ), + esc_url( __( 'https://wordpress.org/' ) ), esc_attr__( 'Powered by WordPress, state-of-the-art semantic personal publishing platform.' ), _x( 'WordPress.org', 'meta widget link text' ) ) ); ?> diff --git a/wp-includes/images/crystal/license.txt b/wp-includes/images/crystal/license.txt index cdabd2fd41..d53f9bf65f 100644 --- a/wp-includes/images/crystal/license.txt +++ b/wp-includes/images/crystal/license.txt @@ -6,4 +6,4 @@ Released under LGPL Modified February 2008 for WordPress -http://wordpress.org \ No newline at end of file +https://wordpress.org \ No newline at end of file diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 63bb8b0dd4..9078b34cda 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -54,7 +54,7 @@ function wp_print_media_templates() {

    {{ data.message }}

    <# } #> -

    native app for your device instead.'), 'http://wordpress.org/mobile/' ); ?>

    +

    native app for your device instead.'), 'https://wordpress.org/mobile/' ); ?>

    -

    WordPress'), 'http://wordpress.org/'); ?>

    +

    WordPress'), 'https://wordpress.org/'); ?>