Use installing variable (from Donncha)

git-svn-id: https://develop.svn.wordpress.org/trunk@2455 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Matt Mullenweg 2005-03-17 23:34:06 +00:00
parent 85c7025241
commit 5b52ad1017
4 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
<?php
$_wp_installing = 1;
define('WP_INSTALLING', true);
if (!file_exists('../wp-config.php'))
die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");

View File

@ -1,5 +1,5 @@
<?php
$_wp_installing = 1;
define('WP_INSTALLING', true);
if (file_exists('../wp-config.php'))
die("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first.");

View File

@ -1,5 +1,5 @@
<?php
$_wp_installing = 1;
define('WP_INSTALLING', true);
if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
require('../wp-config.php');
timer_start();

View File

@ -303,7 +303,7 @@ function url_to_postid($url = '') {
function get_settings($setting) {
global $wpdb, $cache_settings, $cache_nonexistantoptions;
if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') )
if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || constant('WP_INSTALLING') )
return false;
if ( empty($cache_settings) )