WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
12/20/2007 02:10:09 AM (18 years ago)
Author:
ryan
Message:

Set error if there is a problem connecting to the DB. Props skeltoac and Potter_System. fixes #5495

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/install.php

    r6140 r6426  
    1414else
    1515    $step = 0;
     16function display_header(){
    1617header( 'Content-Type: text/html; charset=utf-8' );
    1718?>
    … …  
    2526<body>
    2627<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
     28
    2729<?php
     30}//end function display_header();
     31
    2832// Let's check to make sure WP isn't already installed.
    29 if ( is_blog_installed() ) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
     33if ( is_blog_installed() ) {display_header(); die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');}
    3034
    3135switch($step) {
    3236    case 0:
    3337    case 1: // in case people are directly linking to this
     38      display_header();
    3439?>
    3540<h1><?php _e('Welcome'); ?></h1>
    … …  
    6267        break;
    6368    case 2:
     69      if ( !empty($wpdb->error) )
     70        wp_die($wpdb->error->get_error_message());
     71    display_header();   
    6472        // Fill in the data we gathered
    6573        $weblog_title = stripslashes($_POST['weblog_title']);
Note: See TracChangeset for help on using the changeset viewer.