<!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>[12515] trunk: Use array calling style.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12515">12515</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-23 15:31:02 +0000 (Wed, 23 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use array calling style. Props Denis-de-Bernardy. see <a href="http://trac.wordpress.org/ticket/6647">#6647</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportopmlphp">trunk/wp-admin/import/opml.php</a></li>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
<li><a href="#trunkwpadminimportwpcat2tagphp">trunk/wp-admin/import/wp-cat2tag.php</a></li>
<li><a href="#trunkwpadminincludesbookmarkphp">trunk/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesbookmarkphp">trunk/wp-includes/bookmark.php</a></li>
<li><a href="#trunkwpincludescategoryphp">trunk/wp-includes/category.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwplinksopmlphp">trunk/wp-links-opml.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/opml.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/opml.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/import/opml.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> &lt;p style=&quot;clear: both; margin-top: 1em;&quot;&gt;&lt;label for=&quot;cat_id&quot;&gt;&lt;?php _e('Now select a category you want to put these links in.') ?&gt;&lt;/label&gt;&lt;br /&gt;
</span><span class="cx"> &lt;?php _e('Category:') ?&gt; &lt;select name=&quot;cat_id&quot; id=&quot;cat_id&quot;&gt;
</span><span class="cx"> &lt;?php
</span><del>-$categories = get_terms('link_category', 'get=all');
</del><ins>+$categories = get_terms('link_category', array('get' =&gt; 'all'));
</ins><span class="cx"> foreach ($categories as $category) {
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;option value=&quot;&lt;?php echo $category-&gt;term_id; ?&gt;&quot;&gt;&lt;?php echo esc_html(apply_filters('link_category', $category-&gt;name)); ?&gt;&lt;/option&gt;
</span></span></pre></div>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/import/wordpress.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx">         function process_categories() {
</span><span class="cx">                 global $wpdb;
</span><span class="cx"> 
</span><del>-                $cat_names = (array) get_terms('category', 'fields=names');
</del><ins>+                $cat_names = (array) get_terms('category', array('fields' =&gt; 'names'));
</ins><span class="cx"> 
</span><span class="cx">                 while ( $c = array_shift($this-&gt;categories) ) {
</span><span class="cx">                         $cat_name = trim($this-&gt;get_tag( $c, 'wp:cat_name' ));
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">         function process_tags() {
</span><span class="cx">                 global $wpdb;
</span><span class="cx"> 
</span><del>-                $tag_names = (array) get_terms('post_tag', 'fields=names');
</del><ins>+                $tag_names = (array) get_terms('post_tag', array('fields' =&gt; 'names'));
</ins><span class="cx"> 
</span><span class="cx">                 while ( $c = array_shift($this-&gt;tags) ) {
</span><span class="cx">                         $tag_name = trim($this-&gt;get_tag( $c, 'wp:tag_name' ));
</span></span></pre></div>
<a id="trunkwpadminimportwpcat2tagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wp-cat2tag.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wp-cat2tag.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/import/wp-cat2tag.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx">         function populate_cats() {
</span><span class="cx"> 
</span><del>-                $categories = get_categories('get=all');
</del><ins>+                $categories = get_categories(array('get' =&gt; 'all'));
</ins><span class="cx">                 foreach ( $categories as $category ) {
</span><span class="cx">                         $this-&gt;all_categories[] = $category;
</span><span class="cx">                         if ( is_term( $category-&gt;slug, 'post_tag' ) )
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> 
</span><span class="cx">         function populate_tags() {
</span><span class="cx"> 
</span><del>-                $tags = get_terms( array('post_tag'), 'get=all' );
</del><ins>+                $tags = get_terms( array('post_tag'), array('get' =&gt; 'all') );
</ins><span class="cx">                 foreach ( $tags as $tag ) {
</span><span class="cx">                         $this-&gt;all_tags[] = $tag;
</span><span class="cx">                         if ( is_term( $tag-&gt;slug, 'category' ) )
</span></span></pre></div>
<a id="trunkwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/bookmark.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/bookmark.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/includes/bookmark.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">  */
</span><span class="cx"> function wp_get_link_cats( $link_id = 0 ) {
</span><span class="cx"> 
</span><del>-        $cats = wp_get_object_terms( $link_id, 'link_category', 'fields=ids' );
</del><ins>+        $cats = wp_get_object_terms( $link_id, 'link_category', array('fields' =&gt; 'ids') );
</ins><span class="cx"> 
</span><span class="cx">         return array_unique( $cats );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/includes/export.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> // grab a snapshot of post IDs, just in case it changes during the export
</span><span class="cx"> $post_ids = $wpdb-&gt;get_col(&quot;SELECT ID FROM $wpdb-&gt;posts $where ORDER BY post_date_gmt ASC&quot;);
</span><span class="cx"> 
</span><del>-$categories = (array) get_categories('get=all');
-$tags = (array) get_tags('get=all');
</del><ins>+$categories = (array) get_categories(array('get' =&gt; 'all'));
+$tags = (array) get_tags(array('get' =&gt; 'all'));
</ins><span class="cx"> 
</span><span class="cx"> $custom_taxonomies = $wp_taxonomies;
</span><span class="cx"> unset($custom_taxonomies['category']);
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> while ( $parents = wxr_missing_parents($categories) ) {
</span><del>-        $found_parents = get_categories(&quot;include=&quot; . join(', ', $parents));
</del><ins>+        $found_parents = get_categories(array('include' =&gt; join(', ', $parents)));
</ins><span class="cx">         if ( is_array($found_parents) &amp;&amp; count($found_parents) )
</span><span class="cx">                 $categories = array_merge($categories, $found_parents);
</span><span class="cx">         else
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/includes/template.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -508,11 +508,11 @@
</span><span class="cx">                 $args['popular_cats'] = get_terms( 'category', array( 'fields' =&gt; 'ids', 'orderby' =&gt; 'count', 'order' =&gt; 'DESC', 'number' =&gt; 10, 'hierarchical' =&gt; false ) );
</span><span class="cx"> 
</span><span class="cx">         if ( $descendants_and_self ) {
</span><del>-                $categories = get_categories( &quot;child_of=$descendants_and_self&amp;hierarchical=0&amp;hide_empty=0&quot; );
</del><ins>+                $categories = get_categories(array('child_of' =&gt; $descendants_and_self, 'hierarchical' =&gt; 0, 'hide_empty' =&gt; 0));
</ins><span class="cx">                 $self = get_category( $descendants_and_self );
</span><span class="cx">                 array_unshift( $categories, $self );
</span><span class="cx">         } else {
</span><del>-                $categories = get_categories('get=all');
</del><ins>+                $categories = get_categories(array('get' =&gt; 'all'));
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( $checked_ontop ) {
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx">                 $checked_categories[] = $default;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        $categories = get_terms('link_category', 'orderby=count&amp;hide_empty=0');
</del><ins>+        $categories = get_terms('link_category', array('orderby' =&gt; 'count', 'hide_empty' =&gt; 0));
</ins><span class="cx"> 
</span><span class="cx">         if ( empty($categories) )
</span><span class="cx">                 return;
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-admin/link-manager.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> &lt;input type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Apply'); ?&gt;&quot; name=&quot;doaction&quot; id=&quot;doaction&quot; class=&quot;button-secondary action&quot; /&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;?php
</span><del>-$categories = get_terms('link_category', &quot;hide_empty=1&quot;);
</del><ins>+$categories = get_terms('link_category', array(&quot;hide_empty&quot; =&gt; 1));
</ins><span class="cx"> $select_cat = &quot;&lt;select name=\&quot;cat_id\&quot;&gt;\n&quot;;
</span><span class="cx"> $select_cat .= '&lt;option value=&quot;all&quot;'  . (($cat_id == 'all') ? &quot; selected='selected'&quot; : '') . '&gt;' . __('View all Categories') . &quot;&lt;/option&gt;\n&quot;;
</span><span class="cx"> foreach ((array) $categories as $cat)
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-app.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">                 $home = esc_attr(get_bloginfo_rss('home'));
</span><span class="cx"> 
</span><span class="cx">                 $categories = &quot;&quot;;
</span><del>-                $cats = get_categories(&quot;hierarchical=0&amp;hide_empty=0&quot;);
</del><ins>+                $cats = get_categories(array('hierarchical' =&gt; 0, 'hide_empty' =&gt; 0));
</ins><span class="cx">                 foreach ((array) $cats as $cat) {
</span><span class="cx">                         $categories .= &quot;    &lt;category term=\&quot;&quot; . esc_attr($cat-&gt;name) .  &quot;\&quot; /&gt;\n&quot;;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/bookmark.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/bookmark.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/bookmark.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">                         $_bookmark = &amp; $GLOBALS['link'];
</span><span class="cx">                 } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
</span><span class="cx">                         $_bookmark = $wpdb-&gt;get_row($wpdb-&gt;prepare(&quot;SELECT * FROM $wpdb-&gt;links WHERE link_id = %d LIMIT 1&quot;, $bookmark));
</span><del>-                        $_bookmark-&gt;link_category = array_unique( wp_get_object_terms($_bookmark-&gt;link_id, 'link_category', 'fields=ids') );
</del><ins>+                        $_bookmark-&gt;link_category = array_unique( wp_get_object_terms($_bookmark-&gt;link_id, 'link_category', array('fields' =&gt; 'ids')) );
</ins><span class="cx">                         wp_cache_add($_bookmark-&gt;link_id, $_bookmark, 'bookmark');
</span><span class="cx">                 }
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkwpincludescategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/category.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">  */
</span><span class="cx"> function get_all_category_ids() {
</span><span class="cx">         if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
</span><del>-                $cat_ids = get_terms( 'category', 'fields=ids&amp;get=all' );
</del><ins>+                $cat_ids = get_terms( 'category', array('fields' =&gt; 'ids', 'get' =&gt; 'all') );
</ins><span class="cx">                 wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">         foreach ( (array) $category_paths as $pathdir )
</span><span class="cx">                 $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
</span><span class="cx"> 
</span><del>-        $categories = get_terms( 'category', &quot;get=all&amp;slug=$leaf_path&quot; );
</del><ins>+        $categories = get_terms( 'category', array('get' =&gt; 'all', 'slug' =&gt; $leaf_path) );
</ins><span class="cx"> 
</span><span class="cx">         if ( empty( $categories ) )
</span><span class="cx">                 return null;
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/deprecated.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx">         if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
</span><span class="cx">                 $category = '';
</span><span class="cx"> 
</span><del>-        $results = get_bookmarks(&quot;category=$category&amp;orderby=$orderby&amp;order=$order&amp;show_updated=$show_updated&amp;limit=$limit&quot;);
</del><ins>+        $results = get_bookmarks(array('category' =&gt; $category, 'orderby' =&gt; $orderby, 'order' =&gt; $order, 'show_updated' =&gt; $show_updated, 'limit' =&gt; $limit));
</ins><span class="cx"> 
</span><span class="cx">         if ( !$results )
</span><span class="cx">                 return;
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx">         if ( !isset($direction) )
</span><span class="cx">                 $direction = '';
</span><span class="cx"> 
</span><del>-        $cats = get_categories(&quot;type=link&amp;orderby=$order&amp;order=$direction&amp;hierarchical=0&quot;);
</del><ins>+        $cats = get_categories(array('type' =&gt; 'link', 'orderby' =&gt; $order, 'order' =&gt; $direction, 'hierarchical' =&gt; 0));
</ins><span class="cx"> 
</span><span class="cx">         // Display each category
</span><span class="cx">         if ( $cats ) {
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/link-template.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -933,7 +933,7 @@
</span><span class="cx">                 $join = &quot; INNER JOIN $wpdb-&gt;term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb-&gt;term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id&quot;;
</span><span class="cx"> 
</span><span class="cx">                 if ( $in_same_cat ) {
</span><del>-                        $cat_array = wp_get_object_terms($post-&gt;ID, 'category', 'fields=ids');
</del><ins>+                        $cat_array = wp_get_object_terms($post-&gt;ID, 'category', array('fields' =&gt; 'ids'));
</ins><span class="cx">                         $join .= &quot; AND tt.taxonomy = 'category' AND tt.term_id IN (&quot; . implode(',', $cat_array) . &quot;)&quot;;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx">         $excluded_categories = array();
</span><span class="cx">         if ( !empty($in_same_cat) || !empty($excluded_categories) ) {
</span><span class="cx">                 if ( !empty($in_same_cat) ) {
</span><del>-                        $cat_array = wp_get_object_terms($post-&gt;ID, 'category', 'fields=ids');
</del><ins>+                        $cat_array = wp_get_object_terms($post-&gt;ID, 'category', array('fields' =&gt; 'ids'));
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( !empty($excluded_categories) ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/post.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -1895,7 +1895,7 @@
</span><span class="cx"> 
</span><span class="cx">         // Update counts for the post's terms.
</span><span class="cx">         foreach ( (array) get_object_taxonomies('post') as $taxonomy ) {
</span><del>-                $tt_ids = wp_get_object_terms($post_id, $taxonomy, 'fields=tt_ids');
</del><ins>+                $tt_ids = wp_get_object_terms($post_id, $taxonomy, array('fields' =&gt; 'tt_ids'));
</ins><span class="cx">                 wp_update_term_count($tt_ids, $taxonomy);
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-includes/taxonomy.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -1079,7 +1079,7 @@
</span><span class="cx">                 $taxonomies = array($taxonomies);
</span><span class="cx"> 
</span><span class="cx">         foreach ( (array) $taxonomies as $taxonomy ) {
</span><del>-                $tt_ids = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
</del><ins>+                $tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' =&gt; 'tt_ids'));
</ins><span class="cx">                 $in_tt_ids = &quot;'&quot; . implode(&quot;', '&quot;, $tt_ids) . &quot;'&quot;;
</span><span class="cx">                 do_action( 'delete_term_relationships', $object_id, $tt_ids );
</span><span class="cx">                 $wpdb-&gt;query( $wpdb-&gt;prepare(&quot;DELETE FROM $wpdb-&gt;term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)&quot;, $object_id) );
</span><span class="lines">@@ -1510,7 +1510,7 @@
</span><span class="cx">         if ( ! $append &amp;&amp; isset($t-&gt;sort) &amp;&amp; $t-&gt;sort ) {
</span><span class="cx">                 $values = array();
</span><span class="cx">                 $term_order = 0;
</span><del>-                $final_tt_ids = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
</del><ins>+                $final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' =&gt; 'tt_ids'));
</ins><span class="cx">                 foreach ( $tt_ids as $tt_id )
</span><span class="cx">                         if ( in_array($tt_id, $final_tt_ids) )
</span><span class="cx">                                 $values[] = $wpdb-&gt;prepare( &quot;(%d, %d, %d)&quot;, $object_id, $tt_id, ++$term_order);
</span><span class="lines">@@ -1958,7 +1958,7 @@
</span><span class="cx">         if ( empty( $ids ) )
</span><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        $terms = wp_get_object_terms($ids, $taxonomies, 'fields=all_with_object_id');
</del><ins>+        $terms = wp_get_object_terms($ids, $taxonomies, array('fields' =&gt; 'all_with_object_id'));
</ins><span class="cx"> 
</span><span class="cx">         $object_terms = array();
</span><span class="cx">         foreach ( (array) $terms as $term )
</span><span class="lines">@@ -2029,7 +2029,7 @@
</span><span class="cx">                 return $children;
</span><span class="cx"> 
</span><span class="cx">         $children = array();
</span><del>-        $terms = get_terms($taxonomy, 'get=all');
</del><ins>+        $terms = get_terms($taxonomy, array('get' =&gt; 'all'));
</ins><span class="cx">         foreach ( $terms as $term ) {
</span><span class="cx">                 if ( $term-&gt;parent &gt; 0 )
</span><span class="cx">                         $children[$term-&gt;parent][] = $term-&gt;term_id;
</span></span></pre></div>
<a id="trunkwplinksopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-links-opml.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-links-opml.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/wp-links-opml.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><span class="cx"> if (empty ($link_cat))
</span><del>-        $cats = get_categories(&quot;type=link&amp;hierarchical=0&quot;);
</del><ins>+        $cats = get_categories(array('type' =&gt; 'link', 'hierarchical' =&gt; 0));
</ins><span class="cx"> else
</span><del>-        $cats = get_categories('type=link&amp;hierarchical=0&amp;include='.$link_cat);
</del><ins>+        $cats = get_categories(array('type' =&gt; 'link', 'hierarchical' =&gt; 0, 'include' =&gt; $link_cat));
</ins><span class="cx"> 
</span><span class="cx"> foreach ((array) $cats as $cat) {
</span><span class="cx">         $catname = apply_filters('link_category', $cat-&gt;name);
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> &lt;outline type=&quot;category&quot; title=&quot;&lt;?php echo esc_attr($catname); ?&gt;&quot;&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><del>-        $bookmarks = get_bookmarks(&quot;category={$cat-&gt;term_id}&quot;);
</del><ins>+        $bookmarks = get_bookmarks(array(&quot;category&quot; =&gt; $cat-&gt;term_id));
</ins><span class="cx">         foreach ((array) $bookmarks as $bookmark) {
</span><span class="cx">                 $title = esc_attr(apply_filters('link_title', $bookmark-&gt;link_name));
</span><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (12514 => 12515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php        2009-12-23 15:22:08 UTC (rev 12514)
+++ trunk/xmlrpc.php        2009-12-23 15:31:02 UTC (rev 12515)
</span><span class="lines">@@ -2806,7 +2806,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $categories_struct = array();
</span><span class="cx"> 
</span><del>-                if ( $cats = get_categories('get=all') ) {
</del><ins>+                if ( $cats = get_categories(array('get' =&gt; 'all')) ) {
</ins><span class="cx">                         foreach ( $cats as $cat ) {
</span><span class="cx">                                 $struct['categoryId'] = $cat-&gt;term_id;
</span><span class="cx">                                 $struct['parentId'] = $cat-&gt;parent;
</span><span class="lines">@@ -2998,7 +2998,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $categories_struct = array();
</span><span class="cx"> 
</span><del>-                if ( $cats = get_categories('hide_empty=0&amp;hierarchical=0') ) {
</del><ins>+                if ( $cats = get_categories(array('hide_empty' =&gt; 0, 'hierarchical' =&gt; 0)) ) {
</ins><span class="cx">                         foreach ($cats as $cat) {
</span><span class="cx">                                 $struct['categoryId'] = $cat-&gt;term_id;
</span><span class="cx">                                 $struct['categoryName'] = $cat-&gt;name;
</span></span></pre>
</div>
</div>

</body>
</html>