Changeset 6444

Show
Ignore:
Timestamp:
12/21/07 01:35:26 (8 months ago)
Author:
ryan
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.3/wp-admin/install.php

    r6140 r6444  
    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']); 

  • branches/2.3/wp-admin/setup-config.php

    r6137 r6444  
    44require_once('../wp-includes/compat.php'); 
    55require_once('../wp-includes/functions.php'); 
     6require_once('../wp-includes/classes.php'); 
    67 
    78if (!file_exists('../wp-config-sample.php')) 
    …… 
    162163    // We'll fail here if the values are no good. 
    163164    require_once('../wp-includes/wp-db.php'); 
     165    if ( !empty($wpdb->error) ) 
     166        wp_die($wpdb->error->get_error_message()); 
     167 
    164168    $handle = fopen('../wp-config.php', 'w'); 
    165169 

  • branches/2.3/wp-includes/wp-db.php

    r6443 r6444  
    9898<ul> 
    9999<li>Are you sure it exists?</li> 
     100<li>Does the user <code>".DB_USER."</code> have permission to use the <code>$db</code> database?</li> 
    100101<li>On some systems the name of your database is prefixed with your username, so it would be like username_wordpress. Could that be the problem?</li> 
    101102</ul> 
    …… 
    409410     */ 
    410411    function bail($message) { // Just wraps errors in a nice header and footer 
    411         if ( !$this->show_errors ) 
     412        if ( !$this->show_errors ) { 
     413            if ( class_exists('WP_Error') ) 
     414                $this->error = new WP_Error('500', $message); 
     415            else 
     416                $this->error = $message; 
    412417            return false; 
     418        } 
    413419        wp_die($message); 
    414420    }