Changeset 1325

Show
Ignore:
Timestamp:
06/10/08 15:17:24 (4 months ago)
Author:
donncha
Message:

No need to redirect to install.php - it doesn't exist anyway.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-settings.php

    r1323 r1325  
    244244require_once (ABSPATH . WPINC . '/l10n.php'); 
    245245 
    246 if ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) { 
    247         if ( defined('WP_SITEURL') ) 
    248                 $link = WP_SITEURL . '/wp-admin/install.php'; 
    249         elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
    250                 $link = preg_replace('|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php'; 
    251         else 
    252                 $link = preg_replace('|/[^/]+?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php'; 
    253         require_once(ABSPATH . WPINC . '/kses.php'); 
    254         require_once(ABSPATH . WPINC . '/pluggable.php'); 
    255         wp_redirect($link); 
    256         die(); // have to die here ~ Mark 
     246if ( !is_blog_installed() && !defined('WP_INSTALLING') ) { 
     247        die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark 
    257248} 
    258249