<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15229] trunk/wp-includes: Don't use deprecated functions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15229">15229</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-11 17:49:35 +0000 (Fri, 11 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use deprecated functions. props filosofo, fixes <a href="http://trac.wordpress.org/ticket/13854">#13854</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesthemecompatsidebarphp">trunk/wp-includes/theme-compat/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (15228 => 15229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-06-11 17:18:17 UTC (rev 15228)
+++ trunk/wp-includes/deprecated.php 2010-06-11 17:49:35 UTC (rev 15229)
</span><span class="lines">@@ -2543,7 +2543,7 @@
</span><span class="cx"> */
</span><span class="cx"> function is_taxonomy( $taxonomy ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
</span><del>- return taxonomy_exists( $post_type );
</del><ins>+ return taxonomy_exists( $taxonomy );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2562,4 +2562,4 @@
</span><span class="cx"> function is_term( $term, $taxonomy = '', $parent = 0 ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'term_exists()' );
</span><span class="cx"> return term_exists( $term, $taxonomy, $parent );
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15228 => 15229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-06-11 17:18:17 UTC (rev 15228)
+++ trunk/wp-includes/query.php 2010-06-11 17:49:35 UTC (rev 15229)
</span><span class="lines">@@ -1972,7 +1972,7 @@
</span><span class="cx"> $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
</span><span class="cx"> $include_tags = "'" . implode("', '", $q['tag__in']) . "'";
</span><span class="cx"> $whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) ";
</span><del>- $reqtag = is_term( $q['tag__in'][0], 'post_tag' );
</del><ins>+ $reqtag = term_exists( $q['tag__in'][0], 'post_tag' );
</ins><span class="cx"> if ( !empty($reqtag) )
</span><span class="cx"> $q['tag_id'] = $reqtag['term_id'];
</span><span class="cx"> }
</span><span class="lines">@@ -2000,7 +2000,7 @@
</span><span class="cx"> if ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used
</span><span class="cx">
</span><span class="cx"> if ( $item != 'category__and' ) {
</span><del>- $reqtag = is_term( $q[$item][0], 'post_tag' );
</del><ins>+ $reqtag = term_exists( $q[$item][0], 'post_tag' );
</ins><span class="cx"> if ( !empty($reqtag) )
</span><span class="cx"> $q['tag_id'] = $reqtag['term_id'];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesthemecompatsidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/sidebar.php (15228 => 15229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/sidebar.php 2010-06-11 17:18:17 UTC (rev 15228)
+++ trunk/wp-includes/theme-compat/sidebar.php 2010-06-11 17:49:35 UTC (rev 15229)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> <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>
</span><span class="cx">
</span><span class="cx"> <?php /* If this is a search result */ } elseif (is_search()) { ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
</span><span class="cx"> <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p>
</span></span></pre>
</div>
</div>
</body>
</html>