Changeset 2455

Timestamp:

03/17/2005 11:34:06 PM (19 years ago)

Author:

matt

Message:

Use installing variable (from Donncha)

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-admin/setup-config.php (modified) (1 diff)
• wp-admin/upgrade.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -1 +1 @@
 <?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.");

trunk/wp-admin/setup-config.php

@@ -1 +1 @@
 <?php
-$_wp_installing = 1;
+define('WP_INSTALLING', true);
 
 if (file_exists('../wp-config.php')) 

trunk/wp-admin/upgrade.php

@@ -1 +1 @@
 <?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');

trunk/wp-includes/functions.php

@@ -304 +304 @@
 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;