<!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"> <p style="clear: both; margin-top: 1em;"><label for="cat_id"><?php _e('Now select a category you want to put these links in.') ?></label><br />
</span><span class="cx"> <?php _e('Category:') ?> <select name="cat_id" id="cat_id">
</span><span class="cx"> <?php
</span><del>-$categories = get_terms('link_category', 'get=all');
</del><ins>+$categories = get_terms('link_category', array('get' => 'all'));
</ins><span class="cx"> foreach ($categories as $category) {
</span><span class="cx"> ?>
</span><span class="cx"> <option value="<?php echo $category->term_id; ?>"><?php echo esc_html(apply_filters('link_category', $category->name)); ?></option>
</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' => 'names'));
</ins><span class="cx">
</span><span class="cx">                 while ( $c = array_shift($this->categories) ) {
</span><span class="cx">                         $cat_name = trim($this->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' => 'names'));
</ins><span class="cx">
</span><span class="cx">                 while ( $c = array_shift($this->tags) ) {
</span><span class="cx">                         $tag_name = trim($this->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' => 'all'));
</ins><span class="cx">                 foreach ( $categories as $category ) {
</span><span class="cx">                         $this->all_categories[] = $category;
</span><span class="cx">                         if ( is_term( $category->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' => 'all') );
</ins><span class="cx">                 foreach ( $tags as $tag ) {
</span><span class="cx">                         $this->all_tags[] = $tag;
</span><span class="cx">                         if ( is_term( $tag->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' => '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->get_col("SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
</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' => 'all'));
+$tags = (array) get_tags(array('get' => '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("include=" . join(', ', $parents));
</del><ins>+        $found_parents = get_categories(array('include' => join(', ', $parents)));
</ins><span class="cx">         if ( is_array($found_parents) && 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' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
</span><span class="cx">
</span><span class="cx">         if ( $descendants_and_self ) {
</span><del>-                $categories = get_categories( "child_of=$descendants_and_self&hierarchical=0&hide_empty=0" );
</del><ins>+                $categories = get_categories(array('child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 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' => '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&hide_empty=0');
</del><ins>+        $categories = get_terms('link_category', array('orderby' => 'count', 'hide_empty' => 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"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-$categories = get_terms('link_category', "hide_empty=1");
</del><ins>+$categories = get_terms('link_category', array("hide_empty" => 1));
</ins><span class="cx"> $select_cat = "<select name=\"cat_id\">\n";
</span><span class="cx"> $select_cat .= '<option value="all"' . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('View all Categories') . "</option>\n";
</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 = "";
</span><del>-                $cats = get_categories("hierarchical=0&hide_empty=0");
</del><ins>+                $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0));
</ins><span class="cx">                 foreach ((array) $cats as $cat) {
</span><span class="cx">                         $categories .= " <category term=\"" . esc_attr($cat->name) . "\" />\n";
</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 = & $GLOBALS['link'];
</span><span class="cx">                 } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
</span><span class="cx">                         $_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
</span><del>-                        $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', 'fields=ids') );
</del><ins>+                        $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')) );
</ins><span class="cx">                         wp_cache_add($_bookmark->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&get=all' );
</del><ins>+                $cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => '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', "get=all&slug=$leaf_path" );
</del><ins>+        $categories = get_terms( 'category', array('get' => 'all', 'slug' => $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("category=$category&orderby=$orderby&order=$order&show_updated=$show_updated&limit=$limit");
</del><ins>+        $results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $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("type=link&orderby=$order&order=$direction&hierarchical=0");
</del><ins>+        $cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 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 = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
</span><span class="cx">
</span><span class="cx">                 if ( $in_same_cat ) {
</span><del>-                        $cat_array = wp_get_object_terms($post->ID, 'category', 'fields=ids');
</del><ins>+                        $cat_array = wp_get_object_terms($post->ID, 'category', array('fields' => 'ids'));
</ins><span class="cx">                         $join .= " AND tt.taxonomy = 'category' AND tt.term_id IN (" . implode(',', $cat_array) . ")";
</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->ID, 'category', 'fields=ids');
</del><ins>+                        $cat_array = wp_get_object_terms($post->ID, 'category', array('fields' => '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' => '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' => 'tt_ids'));
</ins><span class="cx">                 $in_tt_ids = "'" . implode("', '", $tt_ids) . "'";
</span><span class="cx">                 do_action( 'delete_term_relationships', $object_id, $tt_ids );
</span><span class="cx">                 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id) );
</span><span class="lines">@@ -1510,7 +1510,7 @@
</span><span class="cx">         if ( ! $append && isset($t->sort) && $t->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' => '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->prepare( "(%d, %d, %d)", $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' => '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' => 'all'));
</ins><span class="cx">         foreach ( $terms as $term ) {
</span><span class="cx">                 if ( $term->parent > 0 )
</span><span class="cx">                         $children[$term->parent][] = $term->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"> <?php
</span><span class="cx">
</span><span class="cx"> if (empty ($link_cat))
</span><del>-        $cats = get_categories("type=link&hierarchical=0");
</del><ins>+        $cats = get_categories(array('type' => 'link', 'hierarchical' => 0));
</ins><span class="cx"> else
</span><del>-        $cats = get_categories('type=link&hierarchical=0&include='.$link_cat);
</del><ins>+        $cats = get_categories(array('type' => 'link', 'hierarchical' => 0, 'include' => $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->name);
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> <outline type="category" title="<?php echo esc_attr($catname); ?>">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-        $bookmarks = get_bookmarks("category={$cat->term_id}");
</del><ins>+        $bookmarks = get_bookmarks(array("category" => $cat->term_id));
</ins><span class="cx">         foreach ((array) $bookmarks as $bookmark) {
</span><span class="cx">                 $title = esc_attr(apply_filters('link_title', $bookmark->link_name));
</span><span class="cx"> ?>
</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' => 'all')) ) {
</ins><span class="cx">                         foreach ( $cats as $cat ) {
</span><span class="cx">                                 $struct['categoryId'] = $cat->term_id;
</span><span class="cx">                                 $struct['parentId'] = $cat->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&hierarchical=0') ) {
</del><ins>+                if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
</ins><span class="cx">                         foreach ($cats as $cat) {
</span><span class="cx">                                 $struct['categoryId'] = $cat->term_id;
</span><span class="cx">                                 $struct['categoryName'] = $cat->name;
</span></span></pre>
</div>
</div>
</body>
</html>