Changeset 6982

Show
Ignore:
Timestamp:
02/22/08 17:36:09 (8 months ago)
Author:
ryan
Message:

Allow overriding the default secret key. Proy. Props nbachiyski. fixes #5960

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/pluggable.php

    r6946 r6982  
    10171017 */ 
    10181018function wp_salt() { 
    1019  
     1019    global $wp_default_secret_key; 
    10201020    $secret_key = ''; 
    1021     if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ('put your unique phrase here' != SECRET_KEY) ) 
     1021    if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ( $wp_default_secret_key != SECRET_KEY) ) 
    10221022        $secret_key = SECRET_KEY; 
    10231023 

  • trunk/wp-settings.php

    r6952 r6982  
    277277 
    278278/** 
     279 * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php 
     280 * @since 2.5 
     281 */ 
     282$wp_default_secret_key = 'put your unique phrase here'; 
     283 
     284/** 
    279285 * It is possible to define this in wp-config.php 
    280286 * @since 2.0.0