diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-28 11:52:44 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-28 11:52:44 +0000 |
| commit | 548bc96ced85963fa53003185b0a2bcb54ea3b18 (patch) | |
| tree | e4bb182e8dc77c35aceb2c4484e361905cc1141f | |
| parent | 08faf4ef353fb54bdc14e1f76303f936db044c62 (diff) | |
| download | wordpress-mu-548bc96ced85963fa53003185b0a2bcb54ea3b18.tar.gz wordpress-mu-548bc96ced85963fa53003185b0a2bcb54ea3b18.tar.xz wordpress-mu-548bc96ced85963fa53003185b0a2bcb54ea3b18.zip | |
Don't abort on fatal errors when installing!
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@83 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-settings.php | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index 7e51374..99d86ae 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -54,23 +54,26 @@ if( substr( $domain, 0, 4 ) == 'www.' ) function is_installed() { global $wpdb, $domain, $base; - $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); - if( $check == false ) { - $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 />'; - } else { - $msg = '<strong>Could Not Find Blog!</strong><br />'; - $msg .= "Searched for <em>" . $domain . $base . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />"; + + if( defined( "WP_INSTALLING" ) == false ) { + $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); + if( $check == false ) { + $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 />'; + } else { + $msg = '<strong>Could Not Find Blog!</strong><br />'; + $msg .= "Searched for <em>" . $domain . $base . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />"; + } + $msg .= "Please check that your database contains the following tables:<ul> + <li> $wpdb->blogs </li> + <li> $wpdb->users </li> + <li> $wpdb->usermeta </li> + <li> $wpdb->site </li> + <li> $wpdb->sitemeta </li> + <li> $wpdb->sitecategories </li> + </ul>"; + $msg .= "If you suspect a problem please report it to <a href='http://mu.wordpress.org/forums/'>support forums</a>!"; + die( "<h1>Fatal Error</h1> " . $msg ); } - $msg .= "Please check that your database contains the following tables:<ul> - <li> $wpdb->blogs </li> - <li> $wpdb->users </li> - <li> $wpdb->usermeta </li> - <li> $wpdb->site </li> - <li> $wpdb->sitemeta </li> - <li> $wpdb->sitecategories </li> - </ul>"; - $msg .= "If you suspect a problem please report it to <a href='http://mu.wordpress.org/forums/'>support forums</a>!"; - die( "<h1>Fatal Error</h1> " . $msg ); } $current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$base'"); if( $current_blog == false ) { |