Changeset 945 for trunk/wp-includes/template-functions-general.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-general.php (modified) (10 diffs)

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

@@ -23 +23 @@
 
 function get_bloginfo($show='') {
-    global $siteurl, $blogfilename, $blogname, $blogdescription, $siteurl, $admin_email;
+    global $blogname, $blogdescription, $admin_email;
 
     $do_perma = 0;
-    $feed_url = $siteurl;
-    $comment_feed_url = $siteurl;
+    $feed_url = get_settings('siteurl');
+    $comment_feed_url = get_settings('siteurl');
 
     if ('' != get_settings('permalink_structure')) {
         $do_perma = 1;
-        $feed_url = $siteurl . '/feed';
-        $comment_feed_url = $siteurl . '/comments/feed';
+        $feed_url = get_settings('siteurl') . '/feed';
+        $comment_feed_url = get_settings('siteurl') . '/comments/feed';
     }
 
     switch($show) {
         case 'url':
-            $output = $siteurl.'/'.$blogfilename;
+            $output = get_settings('siteurl') .'/'. get_settings('blogfilename');
             break;
         case 'description':
@@ -43 +43 @@
             break;
         case 'rdf_url':
-            $output = $siteurl.'/wp-rdf.php';
+            $output = get_settings('siteurl') .'/wp-rdf.php';
             if ($do_perma) {
                 $output = $feed_url . '/rdf/';
@@ -49 +49 @@
             break;
         case 'rss_url':
-            $output = $siteurl.'/wp-rss.php';
+            $output = get_settings('siteurl') .'/wp-rss.php';
             if ($do_perma) {
                 $output = $feed_url . '/rss/';
@@ -55 +55 @@
             break;
         case 'rss2_url':
-            $output = $siteurl.'/wp-rss2.php';
+            $output = get_settings('siteurl') .'/wp-rss2.php';
             if ($do_perma) {
                 $output = $feed_url . '/rss2/';
@@ -61 +61 @@
             break;
         case 'atom_url':
-            $output = $siteurl.'/wp-atom.php';
+            $output = get_settings('siteurl') .'/wp-atom.php';
             if ($do_perma) {
                 $output = $feed_url . '/atom/';
@@ -67 +67 @@
             break;        
         case 'comments_rss2_url':
-            $output = $siteurl.'/wp-commentsrss2.php';
+            $output = get_settings('siteurl') .'/wp-commentsrss2.php';
             if ($do_perma) {
                 $output = $comment_feed_url . '/rss2/';
@@ -73 +73 @@
             break;
         case 'pingback_url':
-            $output = $siteurl.'/xmlrpc.php';
+            $output = get_settings('siteurl') .'/xmlrpc.php';
             break;
         case 'admin_email':
@@ -205 +205 @@
 
 function get_archives($type='', $limit='', $format='html', $before = "", $after = "", $show_post_count = false) {
-    global $tableposts, $time_difference, $siteurl, $blogfilename;
+    global $tableposts, $time_difference;
     global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb, $start_of_week;
 
@@ -220 +220 @@
 
     // archive link url
-    $archive_link_m = $siteurl.'/'.$blogfilename.$querystring_start.'m'.$querystring_equal;    # monthly archive;
-    $archive_link_w = $siteurl.'/'.$blogfilename.$querystring_start.'w'.$querystring_equal;    # weekly archive;
-    $archive_link_p = $siteurl.'/'.$blogfilename.$querystring_start.'p'.$querystring_equal;    # post-by-post archive;
+    $archive_link_m = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'m'.$querystring_equal;    # monthly archive;
+    $archive_link_w = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'w'.$querystring_equal;    # weekly archive;
+    $archive_link_p = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'p'.$querystring_equal;    # post-by-post archive;
 
     // over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
@@ -284 +284 @@
                     $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
                     $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
-                    $url  = sprintf('%s/%s%sm%s%s%sw%s%d', $siteurl, $blogfilename, $querystring_start,
+                    $url  = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('siteurl'), get_settings('blogfilename'), $querystring_start,
                                     $querystring_equal, $arc_year, $querystring_separator,
                                     $querystring_equal, $arcresult->week);