Changeset 4983 for trunk/wp-includes/general-template.php

Timestamp:

03/07/2007 03:05:41 AM (20 years ago)

Author:

ryan

Message:

Standardize on 'url' for fetching the blog's url. Props rob1n. fixes #3623

File:

• trunk/wp-includes/general-template.php (modified) (2 diffs)

trunk/wp-includes/general-template.php

@@ -61 +61 @@
 function bloginfo($show='') {
         $info = get_bloginfo($show);
-        if (!strstr($show, 'url') && //don't filter URLs
-                !strstr($show, 'directory') &&
-                !strstr($show, 'home')) {
+        
+        // Don't filter URL's.
+        if (strpos($show, 'url') === false || 
+                strpos($show, 'directory') === false || 
+                strpos($show, 'home') === false) {
                 $info = apply_filters('bloginfo', $info, $show);
                 $info = convert_chars($info);
@@ -73 +75 @@
 }
 
-
+/**
+ * Note: some of these values are DEPRECATED. Meaning they could be 
+ * taken out at any time and shouldn't be relied upon. Options 
+ * without "// DEPRECATED" are the preferred and recommended ways 
+ * to get the information.
+ */
 function get_bloginfo($show='') {
 
         switch($show) {
                 case 'url' :
-                case 'home' :
-                case 'siteurl' :
+                case 'home' : // DEPRECATED
+                case 'siteurl' : // DEPRECATED
                         $output = get_option('home');
                         break;