From 55f15aaed2a6870ac0d3a60b77d77156c943259d Mon Sep 17 00:00:00 2001 From: Pieter Bos Date: Wed, 19 Sep 2018 19:46:14 +0100 Subject: [PATCH] replace SALTS API link and name, part of the renaming effort in issue #35 (#70) --- src/wp-admin/includes/network.php | 2 +- src/wp-admin/maint/repair.php | 2 +- src/wp-admin/setup-config.php | 2 +- src/wp-includes/pluggable.php | 4 ++-- wp-config-sample.php | 2 +- wp-tests-config-sample.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php index 1d6ed9d33a7..c5c676a6eff 100644 --- a/src/wp-admin/includes/network.php +++ b/src/wp-admin/includes/network.php @@ -452,7 +452,7 @@ function network_step2( $errors = false ) { if ( ! empty( $keys_salts ) ) { $keys_salts_str = ''; - $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); + $from_api = wp_remote_get( 'https://api.classicpress.net/secret-key/1.0/salt/' ); if ( is_wp_error( $from_api ) ) { foreach ( $keys_salts as $c => $v ) { $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );"; diff --git a/src/wp-admin/maint/repair.php b/src/wp-admin/maint/repair.php index 9521a5a5f4e..5263a4aec49 100644 --- a/src/wp-admin/maint/repair.php +++ b/src/wp-admin/maint/repair.php @@ -66,7 +66,7 @@ echo '

' . __( 'Check secret keys' ) . '

'; // Translators: 1: wp-config.php; 2: Secret key service URL. - echo '

' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the WordPress.org secret key service.' ), 'wp-config.php', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '

'; + echo '

' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the ClassicPress.net secret key service.' ), 'wp-config.php', 'https://api.classicpress.net/secret-key/1.0/salt/' ) . '

'; } } elseif ( isset( $_GET['repair'] ) ) { diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index 8a1cf7fa7ff..cd9cb7085fa 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -307,7 +307,7 @@ function setup_config_display_header( $body_classes = array() ) { $no_api = isset( $_POST['noapi'] ); if ( ! $no_api ) { - $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' ); + $secret_keys = wp_remote_get( 'https://api.classicpress.net/secret-key/1.0/salt/' ); } if ( $no_api || is_wp_error( $secret_keys ) ) { diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php index 18f66b560ec..17a118413e7 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -2067,7 +2067,7 @@ function wp_create_nonce($action = -1) { * The secret keys in wp-config.php should be updated to strong, random keys to maximize * security. Below is an example of how the secret key constants are defined. * Do not paste this example directly into wp-config.php. Instead, have a - * {@link https://api.wordpress.org/secret-key/1.1/salt/ secret key created} just + * {@link https://api.classicpress.net/secret-key/1.0/salt/ secret key created} just * for you. * * define('AUTH_KEY', ' XakmM%G4Yt>f`z]MON'); @@ -2084,7 +2084,7 @@ function wp_create_nonce($action = -1) { * * @since WP-2.5.0 * - * @link https://api.wordpress.org/secret-key/1.1/salt/ Create secrets for wp-config.php + * @link https://api.classicpress.net/secret-key/1.0/salt/ Create secrets for wp-config.php * * @staticvar array $cached_salts * @staticvar array $duplicated_keys diff --git a/wp-config-sample.php b/wp-config-sample.php index b5de6200ae5..312a4e9bdd3 100644 --- a/wp-config-sample.php +++ b/wp-config-sample.php @@ -41,7 +41,7 @@ * Authentication Unique Keys and Salts. * * Change these to different unique phrases! - * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service} + * You can generate these using the {@link https://api.classicpress.net/secret-key/1.0/salt/ ClassicPress.net secret-key service} * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again. * * @since WP-2.6.0 diff --git a/wp-tests-config-sample.php b/wp-tests-config-sample.php index 5b38ff4e261..be3daf0d561 100644 --- a/wp-tests-config-sample.php +++ b/wp-tests-config-sample.php @@ -38,7 +38,7 @@ * Authentication Unique Keys and Salts. * * Change these to different unique phrases! - * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service} + * You can generate these using the {@link https://api.classicpress.net/secret-key/1.0/salt/ ClassicPress.net secret-key service} */ define('AUTH_KEY', 'put your unique phrase here'); define('SECURE_AUTH_KEY', 'put your unique phrase here');