<!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" />
<title>[45723] trunk/src: Taxonomy: Fix deprecated calls to `get_terms()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45723">45723</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45723","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-08-03 03:34:54 +0000 (Sat, 03 Aug 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Taxonomy: Fix deprecated calls to `get_terms()`.
The taxonomy should be passed as part of `$args`, rather than as its own argument.
Props sgastard, mukesh27, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/47819">#47819</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercategoryphp">trunk/src/wp-includes/class-walker-category.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetlinksphp">trunk/src/wp-includes/widgets/class-wp-widget-links.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,8 +151,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $s,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1085,11 +1085,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'number' => 45,
- 'orderby' => 'count',
- 'order' => 'DESC',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
+ 'number' => 45,
+ 'orderby' => 'count',
+ 'order' => 'DESC',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,6 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->callback_args,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'page' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,8 +238,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['number'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $args['offset'] = $args['number'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = get_terms( $taxonomy, $args );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = get_terms( $args );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) || ! is_array( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->no_items();
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/export.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = (array) get_tags( array( 'get' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $custom_terms = (array) get_terms(
+ array(
+ 'taxonomy' => $custom_taxonomies,
+ 'get' => 'all',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put categories in order with no child going before its parent.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $cat = array_shift( $categories ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/nav-menu.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,6 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +676,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pad_counts' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = get_terms( $taxonomy_name, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = get_terms( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $terms || is_wp_error( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'No items.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,8 +775,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 10,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,8 +813,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $search_results = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $searched,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/post.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,8 +2041,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_term = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $term,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-admin/includes/template.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,12 +125,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['selected_cats'] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $parsed_args['popular_cats'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['popular_cats'] = $parsed_args['popular_cats'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['popular_cats'] = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,10 +140,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $descendants_and_self ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = (array) get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => $descendants_and_self,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +153,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $self = get_term( $descendants_and_self, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> array_unshift( $categories, $self );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $categories = (array) get_terms(
+ array(
+ 'taxonomy' => $taxonomy,
+ 'get' => 'all',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,8 +214,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'count',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => $number,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,8 +273,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_category',
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'link_category',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesbookmarktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/bookmark-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark-template.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/bookmark-template.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,8 +237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['categorize'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link_category',
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'link_category',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $parsed_args['category_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'include' => $parsed_args['category'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => $parsed_args['exclude_category'],
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/category-template.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Avoid clashes with the 'name' param of get_terms().
</span><span class="cx" style="display: block; padding: 0 10px"> $get_terms_args = $parsed_args;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $get_terms_args['name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $categories = get_terms( $parsed_args['taxonomy'], $get_terms_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $categories = get_terms( $get_terms_args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $name = esc_attr( $parsed_args['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $class = esc_attr( $parsed_args['class'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,7 +701,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['taxonomy'],
</del><span class="cx" style="display: block; padding: 0 10px"> array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $args,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunksrcwpincludescategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/category.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,8 +27,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array( 'taxonomy' => 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy = $args['taxonomy'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the taxonomy used to retrieve terms when calling get_categories().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy to retrieve terms from.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of arguments. See get_terms().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['taxonomy'] = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,11 +49,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>taxonomy => link_category</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy = 'link_category';
- $args['taxonomy'] = $taxonomy;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['taxonomy'] = 'link_category';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $categories = get_terms( $taxonomy, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $categories = get_terms( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $categories ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,10 +133,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'category',
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'get' => 'all',
- 'slug' => $leaf_path,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'category',
+ 'get' => 'all',
+ 'slug' => $leaf_path,
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,8 +276,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Term[]|int $tags Array of 'post_tag' term objects, or a count thereof.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_tags( $args = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags = get_terms( 'post_tag', $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $defaults = array( 'taxonomy' => 'post_tag' );
+ $args = wp_parse_args( $args, $defaults );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags = get_terms( $args );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $tags ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = array();
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-category.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/class-walker-category.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,8 +200,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['current_category'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'current_category' can be an array, so we use `get_terms()`.
</span><span class="cx" style="display: block; padding: 0 10px"> $_current_terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $category->taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $category->taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $args['current_category'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,8 +210,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'taxonomy' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $object,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,8 +365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Query taxonomy terms.
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomies,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomies' => $taxonomies,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name__like' => $args['s'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 20,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => 20 * ( $args['pagenum'] - 1 ),
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/class-wp-term-query.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,8 +428,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $excluded_children = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $excluded_children,
</span><span class="cx" style="display: block; padding: 0 10px"> (array) get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- reset( $taxonomies ),
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => reset( $taxonomies ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'child_of' => intval( $extrunk ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1557,8 +1557,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ambiguous_terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_term_names = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2390,7 +2390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = array( 'taxonomy' => $taxonomy->name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $filter['number'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query['number'] = absint( $filter['number'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2418,7 +2418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query['search'] = $filter['search'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = get_terms( $taxonomy->name, $query );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms = get_terms( $query );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 500, $terms->get_error_message() );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/deprecated.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1287,7 +1287,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '4.0.0', 'get_terms()' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_ids = get_terms(
+ array(
+ 'taxonomy' => 'category',
+ 'fields' => 'ids',
+ 'get' => 'all',
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/nav-menu.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,6 +597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_nav_menus( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => 'nav_menu',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'name',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +613,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $menus An array of menu objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of arguments used to retrieve menu objects.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'wp_get_nav_menus', get_terms( 'nav_menu', $args ), $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wp_get_nav_menus', get_terms( $args ), $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,8 +728,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $terms ) as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'include' => $terms[ $taxonomy ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => 'slug',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prepared_args = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prepared_args = array( 'taxonomy' => $this->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * For each known parameter which is both registered and present in the request,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Used when calling wp_count_terms() below.
</span><span class="cx" style="display: block; padding: 0 10px"> $prepared_args['object_ids'] = $prepared_args['post'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_result = get_terms( $this->taxonomy, $prepared_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_result = get_terms( $prepared_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count_args = $prepared_args;
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/taxonomy.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $deprecated Argument array, when using the legacy function parameter format. If present, this
</span><span class="cx" style="display: block; padding: 0 10px"> * parameter will be interpreted as `$args`, and the first function parameter will
</span><span class="cx" style="display: block; padding: 0 10px"> * be parsed as a taxonomy or array of taxonomies.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of taxonomies
</ins><span class="cx" style="display: block; padding: 0 10px"> * do not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_terms( $args = array(), $deprecated = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1685,7 +1685,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|int|WP_Error Number of terms in that taxonomy or WP_Error if the taxonomy does not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_count_terms( $taxonomy, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $defaults = array( 'hide_empty' => false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $defaults = array(
+ 'taxonomy' => $taxonomy,
+ 'hide_empty' => false,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // backward compatibility
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1696,7 +1699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args['fields'] = 'count';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_terms( $taxonomy, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_terms( $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2191,8 +2194,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * unless a unique slug has been explicitly provided.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $name_matches = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $args['parent'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2219,8 +2222,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $siblings = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'update_term_meta_cache' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3470,8 +3473,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy,
</del><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' => $taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'get' => 'all',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'id=>parent',
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetlinksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-links.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-links.php 2019-08-02 17:08:29 UTC (rev 45722)
+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php 2019-08-03 03:34:54 UTC (rev 45723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'limit' => -1,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_cats = get_terms( 'link_category' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_cats = get_terms( array( 'taxonomy' => 'link_category' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $limit = intval( $instance['limit'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $limit ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = -1;
</span></span></pre>
</div>
</div>
</body>
</html>