Changeset 1386

Show
Ignore:
Timestamp:
07/21/08 09:48:36 (5 months ago)
Author:
donncha
Message:

Don't overwrite site_name, fixes #686, props Andy

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-settings.php

    r1363 r1386  
    300300        define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH.  For back compat. 
    301301 
    302 $current_site->site_name = get_site_option('site_name'); 
     302if( !isset($current_site->site_name) ) 
     303        $current_site->site_name = get_site_option('site_name'); 
    303304if( $current_site->site_name == false ) 
    304305        $current_site->site_name = ucfirst( $current_site->domain );