Changeset 672

Timestamp:

12/31/2003 11:51:41 PM (21 years ago)

Author:

saxmatt

Message:

Installation cleanup.

Location:

trunk

Files:

• wp-admin/install-config.php (modified) (1 diff)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-settings.php (modified) (3 diffs)

trunk/wp-admin/install-config.php

@@ -124 +124 @@
                 fwrite($handle, str_replace("localhost", $dbhost, $line));
                 break;
-            case '$table_prefix  ':
+            case '$table_prefix  =':
                 fwrite($handle, str_replace('wp_', $prefix, $line));
                 break;

trunk/wp-admin/install.php

@@ -657 +657 @@
 <form action="install.php?step=3" method="post">
 <input type="hidden" name="step" value="3" />
-<p>What is the url for your blog? <input name="url" type="text" size="60" />
-, now on to <input type="submit" value="Step 3" ></p>
+<p>What is the URL for your blog?<br />
+<?php
+$guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $HTTP_HOST . $REQUEST_URI);
+?>
+  <input name="url" type="text" size="60" value="<?php echo $guessurl; ?>" />
+</p>
+<p>On to 
+    <input type="submit" value="Step 3..." />
+</p>
 </form>
 

trunk/wp-admin/upgrade-functions.php

@@ -456 +456 @@
 
 function upgrade_100() {
-    global $wpdb, $tableposts, $tablecomments, $tablecategories, $tableoptionvalues, $tableoptiongroups, $tableoptiongroup_options, $tableoptions, $tablepost2cat;
+    global $wpdb, $tableposts, $tablecomments, $tablecategories, $tableoptionvalues, $tableoptiongroups, $tableoptiongroup_options, $tableoptions, $tablepost2cat, $tablelinks, $tableusers;
     maybe_add_column($tableposts, 'post_name', "ALTER TABLE `$tableposts` ADD `post_name` VARCHAR(200) NOT NULL");
     maybe_add_column($tableposts, 'to_ping', "ALTER TABLE $tableposts ADD `to_ping` TEXT NOT NULL");
@@ -465 +465 @@
     maybe_add_column($tablecategories, 'category_description', "ALTER TABLE `$tablecategories` ADD `category_description` TEXT NOT NULL");
     maybe_add_column($tablecategories, 'category_parent', "ALTER TABLE `$tablecategories` ADD `category_parent` INT(4) NOT NULL");
+    maybe_add_column($tablelinks, 'link_rss', "ALTER TABLE `$tablelinks` ADD `link_rss` VARCHAR( 255 ) NOT NULL;");
+    maybe_add_column($tableusers, 'user_description', "ALTER TABLE `$tableusers` ADD `user_description` TEXT NOT NULL");
 
     // Create indicies

trunk/wp-includes/functions.php

@@ -542 +542 @@
 
 function get_settings($setting) {
-    global $wpdb, $cache_settings, $use_cache;
+    global $wpdb, $cache_settings, $use_cache, $REQUEST_URI;
+    if (strstr($REQUEST_URI, 'install.php')) return false;
     if ((empty($cache_settings)) OR (!$use_cache)) {
         $settings = get_alloptions();

trunk/wp-settings.php

@@ -18 +18 @@
 $tableoptiongroups        = $table_prefix . 'optiongroups';
 $tableoptiongroup_options = $table_prefix . 'optiongroup_options';
+define('WPINC', 'wp-includes');
+require (ABSPATH . WPINC . '/wp-db.php');
+
+$wpdb->hide_errors();
+if (!$wpdb->get_row("SELECT * FROM $tableoptions LIMIT 1") && !strstr($REQUEST_URI, 'install.php')) {
+    die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
+}
+$wpdb->show_errors();
 
 // This is the name of the include directory. No "/" allowed.
-define('WPINC', 'wp-includes');
 
+require (ABSPATH . WPINC . '/functions.php');
 require (ABSPATH . 'wp-config-extra.php');
-require (ABSPATH . WPINC . '/wp-db.php');
-require (ABSPATH . WPINC . '/functions.php');
 require (ABSPATH . WPINC . '/template-functions.php');
 require (ABSPATH . WPINC . '/class-xmlrpc.php');
@@ -36 +42 @@
 // get_settings() wherever these are needed OR
 // accessing a single global $all_settings var
-if (!isset($_wp_installing) || !$_wp_installing) {
+if (!strstr($REQUEST_URI, 'install.php')) {
     $siteurl = get_settings('siteurl');
     // "When trying to design a foolproof system, 
@@ -99 +105 @@
 } //end !$_wp_installing
 
+
+
 require (ABSPATH . WPINC . '/vars.php');
 ?>