Changeset 5093

Timestamp:

03/23/2007 05:45:40 PM (18 years ago)

Author:

ryan

Message:

Allow siteurl and home to be defined as constants in wp-config, bypassing the DB. Props filosofo and charleshooper. fixes #4003

Location:

trunk

Files:

• wp-admin/options-general.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/options-general.php

@@ -26 +26 @@
 <tr valign="top"> 
 <th scope="row"><?php _e('WordPress address (URL):') ?></th> 
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td> 
+<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td> 
 </tr> 
 <tr valign="top">
 <th scope="row"><?php _e('Blog address (URL):') ?></th>
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
+<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
 </tr>
 <tr valign="top"> 

trunk/wp-admin/upgrade-functions.php

@@ -22 +22 @@
     update_option('blog_public', $public);
     $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+
+    if ( defined('WP_SITEURL') && '' != WP_SITEURL )
+        $guessurl = WP_SITEURL;
+    else
+        $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+
     update_option('siteurl', $guessurl);
 

trunk/wp-includes/default-filters.php

@@ -146 +146 @@
 add_filter('option_ping_sites', 'privacy_ping_filter');
 add_filter('option_blog_charset', 'wp_specialchars');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
 add_filter('mce_plugins', '_mce_load_rtl_plugin');
 add_filter('mce_buttons', '_mce_add_direction_buttons');

trunk/wp-includes/functions.php

@@ -994 +994 @@
     $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
     $wpdb->show_errors();
-    return $installed;
+
+    $install_status = !empty( $installed ) ? TRUE : FALSE;
+    return $install_status;
 }
 
@@ -1350 +1352 @@
 <?php
     die();
+}
+
+function _config_wp_home($url = '') {
+    if ( defined( 'WP_HOME' ) ) 
+        return WP_HOME;
+    else return $url;
+}
+
+function _config_wp_siteurl($url = '') {
+    if ( defined( 'WP_SITEURL' ) ) 
+        return WP_SITEURL;
+    else return $url;
 }