Changeset 616

Show
Ignore:
Timestamp:
06/29/06 14:07:09 (2 years ago)
Author:
donncha
Message:

Improve the error message shown on bad installs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wpmu-settings.php

    r614 r616  
    132132 
    133133function is_installed() { 
    134     global $wpdb, $domain, $path; 
     134       global $wpdb, $domain, $path; 
    135135        $base = stripslashes( $base ); 
    136     if( defined( "WP_INSTALLING" ) == false ) { 
    137             $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); 
    138             if( $check == false ) { 
    139                     $msg = '<strong>Database Tables Missing.</strong><br /> The table <em>' . DB_NAME . '::' . $wpdb->site . '</em> is missing. Delete the .htaccess file and run the installer again!<br />'; 
    140             } else { 
    141                     $msg = '<strong>Could Not Find Blog!</strong><br />'; 
    142                     $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />"; 
    143             } 
    144             $msg .= "Please check that your database contains the following tables:<ul> 
    145                     <li> $wpdb->blogs </li> 
    146                     <li> $wpdb->users </li> 
    147                     <li> $wpdb->usermeta </li> 
    148                     <li> $wpdb->site </li> 
    149                     <li> $wpdb->sitemeta </li> 
    150                     <li> $wpdb->sitecategories </li> 
    151                     </ul>"; 
    152             $msg .= "If you suspect a problem please report it to <a href='http://mu.wordpress.org/forums/'>support forums</a>!"; 
    153             die( "<h1>Fatal Error</h1> " . $msg ); 
    154     } 
     136        if( defined( "WP_INSTALLING" ) == false ) { 
     137                $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); 
     138                if( $check == false ) { 
     139                        $msg = '<strong>Database Tables Missing.</strong><br /> The table <em>' . DB_NAME . '::' . $wpdb->site . '</em> is missing. Delete the .htaccess file and run the installer again!<br />'; 
     140                } else { 
     141                        $msg = '<strong>Could Not Find Blog!</strong><br />'; 
     142                        $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />"; 
     143                } 
     144                $msg .= "<br />\n<h1>What do I do now?</h1>"; 
     145                $msg .= "Read the <a target='_blank' href='http://trac.mu.wordpress.org/wiki/DebuggingWpmu'>bug report</a> page. Some of the guidelines there may help you figure out what went wrong.<br />"; 
     146                $msg .= "If you're still stuck with this message, then check that your database contains the following tables:<ul> 
     147                        <li> $wpdb->blogs </li> 
     148                        <li> $wpdb->users </li> 
     149                        <li> $wpdb->usermeta </li> 
     150                        <li> $wpdb->site </li> 
     151                        <li> $wpdb->sitemeta </li> 
     152                        <li> $wpdb->sitecategories </li> 
     153                        </ul>"; 
     154                $msg .= "If you suspect a problem please report it to <a href='http://mu.wordpress.org/forums/'>support forums</a> but follow the <a href='http://trac.mu.wordpress.org/wiki/DebuggingWpmu'>guidelines</a>!<br /><br />"; 
     155                if( is_file( 'release-info.txt' ) ) { 
     156                        $msg .= 'Your bug report must include the following text: "'; 
     157                        $info = file( 'release-info.txt' ); 
     158                        $msg .= $info[ 4 ] . '"'; 
     159                } 
     160 
     161                die( "<h1>Fatal Error</h1> " . $msg ); 
     162        } 
    155163} 
    156164