Ticket #4516: general-template-php.diff

E:/EclipseWork/WordPressDev/wp-includes/general-template.php

@@ -60 +60 @@
 
 
 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, true);
 }
 
 /**
@@ -81 +69 @@
  * without "// DEPRECATED" are the preferred and recommended ways 
  * to get the information.
  */
-function get_bloginfo($show='') {
+function get_bloginfo($show='', $filter=false) {
 
         switch($show) {
                 case 'url' :
@@ -153 +141 @@
                         $output = get_option('blogname');
                         break;
         }
+    if( $filter ) {
+                // Don't filter URL's.
+                if (strpos($show, 'url') === false &&
+                        strpos($show, 'directory') === false &&
+                        strpos($show, 'home') === false) {
+                        $output = apply_filters('bloginfo', $output, $show);
+                        $output = convert_chars($output);
+                } else {
+                        $output = apply_filters('bloginfo_url', $output, $show);
+                }
+    }
+
         return $output;
 }