Changeset 1203 for trunk/wp-includes/functions.php

Timestamp:

04/28/2004 07:27:03 AM (22 years ago)

Author:

saxmatt

Message:

Allow WordPress installation URI and blog URI to be different.

File:

• trunk/wp-includes/functions.php (modified) (6 diffs)

trunk/wp-includes/functions.php

@@ -225 +225 @@
         global $wpdb, $tableposts;
 
-        $siteurl = get_settings('siteurl');
+        $siteurl = get_settings('home');
         // Take a link like 'http://example.com/blog/something'
         // and extract just the '/something':
@@ -311 +311 @@
         }
 
+        if ('home' == $setting && '' == $settings->home) return $settings->siteurl;
+
         if (!isset($settings->$setting)) {
                 return false;
@@ -326 +328 @@
                         //  never underestimate the ingenuity of the fools :)"
                         if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+                        if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+
                         $all_options->{$option->option_name} = $option->option_value;
                 }
@@ -532 +536 @@
   $f = new xmlrpcmsg('weblogUpdates.ping',
                                 array(new xmlrpcval(get_settings('blogname'), 'string'),
-                                        new xmlrpcval(get_settings('siteurl') ,'string')));
+                                        new xmlrpcval(get_settings('home') ,'string')));
   $c = new xmlrpc_client($path, $server, 80);
   $r = $c->send($f);
@@ -637 +641 @@
                 $link_text = $matches[4][$i];
                 $content = str_replace($link_match, $link_text.' '.$link_number, $content);
-                $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('siteurl') . $link_url : $link_url;
+                $link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('home') . $link_url : $link_url;
                 $links_summary .= "\n".$link_number.' '.$link_url;
         }
@@ -918 +922 @@
 function pingGeoURL($blog_ID) {
 
-    $ourUrl = get_settings('siteurl') ."/index.php?p=".$blog_ID;
+    $ourUrl = get_settings('home') ."/index.php?p=".$blog_ID;
     $host="geourl.org";
     $path="/ping/?p=".$ourUrl;