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

Timestamp:

02/26/2004 04:15:48 PM (21 years ago)

Author:

saxmatt

Message:

Removed global $siteurl and $blogfilename, use get_settings. Syntax fix for wp-db.

File:

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

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

@@ -36 +36 @@
 
 function permalink_single_rss($file = '') {
-    global $siteurl;
     echo get_permalink();
 }
@@ -42 +41 @@
 function get_permalink($id=false) {
     global $post, $wpdb, $tableposts;
-    global $siteurl, $blogfilename, $querystring_start, $querystring_equal;
+    global $querystring_start, $querystring_equal;
 
     $rewritecode = array(
@@ -61 +60 @@
                 $post->ID
             );
-            return $siteurl . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+            return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
         } else { // if they're not using the fancy permalink option
-            return $siteurl . '/' . $blogfilename.$querystring_start.'p'.$querystring_equal.$post->ID;
+            return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$post->ID;
         }
     } else { // if an ID is given
@@ -76 +75 @@
                 $id
             );
-            return $siteurl . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+            return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
         } else {
-            return $siteurl . '/' . $blogfilename.$querystring_start.'p'.$querystring_equal.$id;
+            return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$id;
         }
     }
@@ -84 +83 @@
 
 function get_month_link($year, $month) {
-    global $siteurl, $blogfilename, $querystring_start, $querystring_equal;
+    global $querystring_start, $querystring_equal;
     if (!$year) $year = date('Y', time()+($time_difference * 3600));
     if (!$month) $month = date('m', time()+($time_difference * 3600));
@@ -95 +94 @@
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
         $monthlink = str_replace('%post_id%', '', $monthlink);
-        return $siteurl . $monthlink;
+        return get_settings('siteurl') . $monthlink;
     } else {
-        return $siteurl.'/'.$blogfilename.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
+        return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
     }
 }
 
 function get_day_link($year, $month, $day) {
-    global $siteurl, $blogfilename, $querystring_start, $querystring_equal;
+    global $querystring_start, $querystring_equal;
     if (!$year) $year = date('Y', time()+($time_difference * 3600));
     if (!$month) $month = date('m', time()+($time_difference * 3600));
@@ -115 +114 @@
         $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
         $daylink = str_replace('%post_id%', '', $daylink);
-        return $siteurl . $daylink;
+        return get_settings('siteurl') . $daylink;
     } else {
-        return $siteurl.'/'.$blogfilename.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
+        return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
     }
 }
 
 function edit_post_link($link = 'Edit This', $before = '', $after = '') {
-    global $user_level, $post, $siteurl;
+    global $user_level, $post;
 
     get_currentuserinfo();
@@ -135 +134 @@
     }
 
-    $location = "$siteurl/wp-admin/post.php?action=edit&post=$post->ID";
+    $location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
     echo "$before <a href=\"$location\">$link</a> $after";
 }
 
 function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
-    global $user_level, $post, $comment, $siteurl;
+    global $user_level, $post, $comment;
 
     get_currentuserinfo();
@@ -153 +152 @@
     }
 
-    $location = "$siteurl/wp-admin/post.php?action=editcomment&amp;comment=$comment->comment_ID";
+    $location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&amp;comment=$comment->comment_ID";
     echo "$before <a href=\"$location\">$link</a> $after";
 }