IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some filtering. Props jhodgdon. see #4516

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@5998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2007-08-31 23:55:56 +00:00
parent 277e5aa914
commit 93840b1632
5 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wp-includes/general-template.php
View File

@@ -60,19 +60,7 @@ function wp_meta() {
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');
}
/**
@@ -81,7 +69,7 @@ function bloginfo($show='') {
* without "// DEPRECATED" are the preferred and recommended ways
* to get the information.
*/
function get_bloginfo($show='') {
function get_bloginfo($show = '', $filter = 'raw') {
switch($show) {
case 'url' :
@@ -153,6 +141,20 @@ function get_bloginfo($show='') {
$output = get_option('blogname');
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;
}