From 05cbd5ec91d9b273bb32650480827235ad47d8cf Mon Sep 17 00:00:00 2001
From: Jon Cave <duck_@git.wordpress.org>
Date: Sun, 28 Jul 2013 19:45:57 +0000
Subject: [PATCH] Remove unnecessary secret_salt_warning().

If salts/keys are not defined in wp-config.php then they will be generated
automatically and stored in the database. [19771] also deals with values
that are duplicated or set to default.

Fixes #14803.


git-svn-id: https://develop.svn.wordpress.org/trunk@24813 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/ms.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 6f59dd6570..958b350fff 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -503,26 +503,6 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
 	echo implode( "\n\t", $output );
 }
 
-/* Warn the admin if SECRET SALT information is missing from wp-config.php */
-function secret_salt_warning() {
-	if ( !is_super_admin() )
-		return;
-	$secret_keys = array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' );
-	$out = '';
-	foreach( $secret_keys as $key ) {
-		if ( ! defined( $key ) )
-			$out .= "define( '$key', '" . esc_html( wp_generate_password( 64, true, true ) ) . "' );<br />";
-	}
-	if ( $out != '' ) {
-		$msg  = __( 'Warning! WordPress encrypts user cookies, but you must add the following lines to <strong>wp-config.php</strong> for it to be more secure.' );
-		$msg .= '<br/>' . __( "Before the line <code>/* That's all, stop editing! Happy blogging. */</code> please add this code:" );
-		$msg .= "<br/><br/><code>$out</code>";
-
-		echo "<div class='update-nag'>$msg</div>";
-	}
-}
-add_action( 'network_admin_notices', 'secret_salt_warning' );
-
 function site_admin_notice() {
 	global $wp_db_version;
 	if ( !is_super_admin() )