Changeset 15229

Timestamp:

06/11/2010 05:49:35 PM (15 years ago)

Author:

nacin

Message:

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

Location:

trunk/wp-includes

Files:

• deprecated.php (modified) (1 diff)
• query.php (modified) (2 diffs)
• theme-compat/sidebar.php (modified) (1 diff)

trunk/wp-includes/deprecated.php

@@ -2544 +2544 @@
 function is_taxonomy( $taxonomy ) {
     _deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
-    return taxonomy_exists( $post_type );
+    return taxonomy_exists( $taxonomy );
 }
 

trunk/wp-includes/query.php

@@ -1973 +1973 @@
             $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'];
@@ -2001 +2001 @@
 
             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'];

trunk/wp-includes/theme-compat/sidebar.php

@@ -42 +42 @@
 
             <?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'])) { ?>