Migrating more of the global options to get_settings().

git-svn-id: http://svn.automattic.com/wordpress/trunk@955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2004-02-29 08:43:36 +00:00
parent 9fc821da98
commit 9e718aff7a
10 changed files with 15 additions and 27 deletions
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -22,7 +22,7 @@ function bloginfo_unicode($show='') {
 }

 function get_bloginfo($show='') {
-    global $blogname, $blogdescription, $admin_email;
+    global $blogname, $admin_email;

    $do_perma = 0;
    $feed_url = get_settings('siteurl');
@@ -39,7 +39,7 @@ function get_bloginfo($show='') {
            $output = get_settings('siteurl') .'/'. get_settings('blogfilename');
            break;
        case 'description':
-            $output = $blogdescription;
+            $output = get_settings('blogdescription');
            break;
        case 'rdf_url':
            $output = get_settings('siteurl') .'/wp-rdf.php';