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

Timestamp:

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

Author:

saxmatt

Message:

Allow WordPress installation URI and blog URI to be different.

File:

• trunk/wp-includes/template-functions-links.php (modified) (4 diffs)

trunk/wp-includes/template-functions-links.php

@@ -64 +64 @@
                 $post->ID
             );
-            return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+            return get_settings('home') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
         } else { // if they're not using the fancy permalink option
-            return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$post->ID;
+            return get_settings('home') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$post->ID;
         }
     } else { // if an ID is given
@@ -79 +79 @@
                 $id
             );
-            return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+            return get_settings('home') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
         } else {
-            return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$id;
+            return get_settings('home') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$id;
         }
     }
@@ -98 +98 @@
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
         $monthlink = str_replace('%post_id%', '', $monthlink);
-        return get_settings('siteurl') . $monthlink;
+        return get_settings('home') . $monthlink;
     } else {
-        return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
+        return get_settings('home') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
     }
 }
@@ -118 +118 @@
         $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
         $daylink = str_replace('%post_id%', '', $daylink);
-        return get_settings('siteurl') . $daylink;
+        return get_settings('home') . $daylink;
     } else {
-        return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
+        return get_settings('home') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
     }
 }