Changeset 8242 for branches/crazyhorse/wp-admin/includes/schema.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/schema.php (modified) (2 diffs)

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

@@ -154 +154 @@
 function populate_options() {
     global $wpdb, $wp_db_version;
-
-    $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+    
+    $guessurl = wp_guess_url();
     
     do_action('populate_options');
@@ -256 +255 @@
     // 2.6
     add_option('avatar_default', 'mystery');
-    add_option('enable_app',0);
-    add_option('enable_xmlrpc',0);
+    add_option('enable_app', 0);
+    add_option('enable_xmlrpc', 0);
     
     // Delete unused options