Changeset 1373

Show
Ignore:
Timestamp:
07/11/08 16:12:47 (5 months ago)
Author:
donncha
Message:

Make sure the site_id is always set to something. Fixes #600, but presumes it's site_id 1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wpmu-settings.php

    r1326 r1373  
    135135$blog_id = $current_blog->blog_id; 
    136136$public  = $current_blog->public; 
     137 
     138if( $current_blog->site_id == 0 || $current_blog->site_id == '' ) 
     139        $current_blog->site_id = 1; 
    137140$site_id = $current_blog->site_id; 
    138141 
    139 if( $site_id == 0 ) 
    140         $site_id = 1; 
    141142 
    142143$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = '$site_id' AND meta_key = 'site_name'" );