<!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>[13754] trunk: Account for old type=link (now taxonomy=link_category)
in wp_dropdown_categories().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13754">13754</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-18 20:17:15 +0000 (Thu, 18 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Account for old type=link (now taxonomy=link_category) in wp_dropdown_categories(). Don't use the deprecated argument in options-writing. Sprinkle in some deprecated warnings. fixes <a href="http://trac.wordpress.org/ticket/12630">#12630</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludescategoryphp">trunk/wp-includes/category.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (13753 => 13754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2010-03-18 19:25:55 UTC (rev 13753)
+++ trunk/wp-admin/options-writing.php 2010-03-18 20:17:15 UTC (rev 13754)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <?php
</span><del>-wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'type' => 'link'));
</del><ins>+wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'taxonomy' => 'link_category'));
</ins><span class="cx"> ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (13753 => 13754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-03-18 19:25:55 UTC (rev 13753)
+++ trunk/wp-includes/category-template.php 2010-03-18 20:17:15 UTC (rev 13754)
</span><span class="lines">@@ -318,6 +318,7 @@
</span><span class="cx"> * 'id' (string) - The ID attribute value for select element. Defaults to name if omitted.
</span><span class="cx"> * 'class' (string) - The class attribute value for select element.
</span><span class="cx"> * 'selected' (int) - Which category ID is selected.
</span><ins>+ * 'taxonomy' (string) - The name of the taxonomy to retrieve. Defaults to category.
</ins><span class="cx"> *
</span><span class="cx"> * The 'hierarchical' argument, which is disabled by default, will override the
</span><span class="cx"> * depth argument, unless it is true. When the argument is false, it will
</span><span class="lines">@@ -345,6 +346,12 @@
</span><span class="cx">
</span><span class="cx"> $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
</span><span class="cx">
</span><ins>+ // Back compat.
+ if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+ _deprecated_argument( __FUNCTION__, '3.0', '' );
+ $args['taxonomy'] = 'link_category';
+ }
+
</ins><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><span class="cx"> if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
</span></span></pre></div>
<a id="trunkwpincludescategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category.php (13753 => 13754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category.php 2010-03-18 19:25:55 UTC (rev 13753)
+++ trunk/wp-includes/category.php 2010-03-18 20:17:15 UTC (rev 13754)
</span><span class="lines">@@ -42,8 +42,11 @@
</span><span class="cx">
</span><span class="cx"> $taxonomy = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
</span><span class="cx">
</span><del>- if ( isset($args['type']) && 'link' == $args['type'] ) //Back compat
</del><ins>+ // Back compat
+ if ( isset($args['type']) && 'link' == $args['type'] ) {
+ _deprecated_argument( __FUNCTION__, '3.0', '' );
</ins><span class="cx"> $taxonomy = $args['taxonomy'] = 'link_category';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $categories = (array) get_terms( $taxonomy, $args );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>