Changeset 8242 for branches/crazyhorse/wp-admin/includes/upgrade.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-admin/includes/upgrade.php (modified) (5 diffs)

branches/crazyhorse/wp-admin/includes/upgrade.php

@@ -7 +7 @@
 
 if ( !function_exists('wp_install') ) :
-function wp_install($blog_title, $user_name, $user_email, $public, $remote) {
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
     global $wp_rewrite;
 
@@ -19 +19 @@
     update_option('admin_email', $user_email);
     update_option('blog_public', $public);
-    update_option('enable_app',$remote);
-    update_option('enable_xmlrpc',$remote);
-
-    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-
-    if ( defined('WP_SITEURL') && '' != WP_SITEURL )
-        $guessurl = WP_SITEURL;
-    else
-        $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+
+    $guessurl = wp_guess_url();
 
     update_option('siteurl', $guessurl);
@@ -212 +205 @@
         upgrade_252();
 
-    if ( $wp_current_db_version < 8000 )
+    if ( $wp_current_db_version < 8201 )
         upgrade_260();
 
@@ -750 +743 @@
 
 function upgrade_260() {
-    populate_roles_260();
+    if ( $wp_current_db_version < 8000 )
+        populate_roles_260();
+
+    if ( $wp_current_db_version < 8201 ) {
+        update_option('enable_app', 1);
+        update_option('enable_xmlrpc', 1);
+    }
 }
 
@@ -882 +881 @@
     global $wpdb;
 
-    // Seperate individual queries into an array
+    // Separate individual queries into an array
     if( !is_array($queries) ) {
         $queries = explode( ';', $queries );