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

Timestamp:

08/31/2007 11:55:56 PM (17 years ago)

Author:

ryan

Message:

Add some filtering. Props jhodgdon. see #4516

File:

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

trunk/wp-includes/general-template.php

@@ -61 +61 @@
 
 function bloginfo($show='') {
-    $info = get_bloginfo($show);
-
-    // 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);
-    } else {
-        $info = apply_filters('bloginfo_url', $info, $show);
-    }
-
-    echo $info;
+    echo get_bloginfo($show, 'display');
 }
 
@@ -82 +70 @@
  * to get the information.
  */
-function get_bloginfo($show='') {
+function get_bloginfo($show = '', $filter = 'raw') {
 
     switch($show) {
@@ -154 +142 @@
             break;
     }
+
+    $url = true;
+    if (strpos($show, 'url') === false &&
+        strpos($show, 'directory') === false &&
+        strpos($show, 'home') === false)
+        $url = false;
+            
+    if ( 'display' == $filter ) {
+        if ( $url )
+            $output = apply_filters('bloginfo_url', $output, $show);
+        else
+            $output = apply_filters('bloginfo', $output, $show);
+    }
+
     return $output;
 }