Skip to content

Commit

Permalink
replace SALTS API link and name, part of the renaming effort in issue…
Browse files Browse the repository at this point in the history
… #35 (#70)
  • Loading branch information
senlin authored and nylen committed Sep 19, 2018
1 parent 4ba8c86 commit 55f15aa
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/wp-admin/includes/network.php
Expand Up @@ -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 ) . "' );";
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/maint/repair.php
Expand Up @@ -66,7 +66,7 @@
echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';

// Translators: 1: wp-config.php; 2: Secret key service URL.
echo '<p>' . 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 <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
echo '<p>' . 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 <a href="%2$s">ClassicPress.net secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.classicpress.net/secret-key/1.0/salt/' ) . '</p>';
}

} elseif ( isset( $_GET['repair'] ) ) {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/setup-config.php
Expand Up @@ -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 ) ) {
Expand Down
4 changes: 2 additions & 2 deletions src/wp-includes/pluggable.php
Expand Up @@ -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', ' Xakm<o xQy rw4EMsLKM-?!T+,PFF})H4lzcW57AF0U@N@< >M%G4Yt>f`z]MON');
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wp-config-sample.php
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wp-tests-config-sample.php
Expand Up @@ -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');
Expand Down

0 comments on commit 55f15aa

Please sign in to comment.