Don't use deprecated functions. props filosofo, fixes #13854.

nacin · nacin · commit ec9f6d34cb83 · 2010-06-11T17:49:35.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@15229 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
@@ -2543,7 +2543,7 @@ function is_post_type( $post_type ) {
  */
 function is_taxonomy( $taxonomy ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $post_type );
+	return taxonomy_exists( $taxonomy );
 }
 
 /**
@@ -2562,4 +2562,4 @@ function is_taxonomy( $taxonomy ) {
 function is_term( $term, $taxonomy = '', $parent = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'term_exists()' );
 	return term_exists( $term, $taxonomy, $parent );
-}
+}
diff --git a/wp-includes/query.php b/wp-includes/query.php
@@ -1972,7 +1972,7 @@ function &get_posts() {
 			$whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
 			$include_tags = "'" . implode("', '", $q['tag__in']) . "'";
 			$whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) ";
-			$reqtag = is_term( $q['tag__in'][0], 'post_tag' );
+			$reqtag = term_exists( $q['tag__in'][0], 'post_tag' );
 			if ( !empty($reqtag) )
 				$q['tag_id'] = $reqtag['term_id'];
 		}
@@ -2000,7 +2000,7 @@ function &get_posts() {
 			if ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used
 
 			if ( $item != 'category__and' ) {
-				$reqtag = is_term( $q[$item][0], 'post_tag' );
+				$reqtag = term_exists( $q[$item][0], 'post_tag' );
 				if ( !empty($reqtag) )
 					$q['tag_id'] = $reqtag['term_id'];
 			}
diff --git a/wp-includes/theme-compat/sidebar.php b/wp-includes/theme-compat/sidebar.php
@@ -41,7 +41,7 @@
 			<p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the year %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time('Y')); ?></p>
 
 			<?php /* If this is a search result */ } elseif (is_search()) { ?>
-			<p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), wp_specialchars(get_search_query(), true)); ?></p>
+			<p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), esc_html( get_search_query() ) ); ?></p>
 
 			<?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
 			<p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p>
