Changeset 12515

Timestamp:

12/23/2009 03:31:02 PM (17 years ago)

Author:

ryan

Message:

Use array calling style. Props Denis-de-Bernardy. see #6647

Location:

trunk

Files:

• wp-admin/import/opml.php (modified) (1 diff)
• wp-admin/import/wordpress.php (modified) (2 diffs)
• wp-admin/import/wp-cat2tag.php (modified) (2 diffs)
• wp-admin/includes/bookmark.php (modified) (1 diff)
• wp-admin/includes/export.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/link-manager.php (modified) (1 diff)
• wp-app.php (modified) (1 diff)
• wp-includes/bookmark.php (modified) (1 diff)
• wp-includes/category.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (4 diffs)
• wp-links-opml.php (modified) (2 diffs)
• xmlrpc.php (modified) (2 diffs)

trunk/wp-admin/import/opml.php

@@ -56 +56 @@
 <?php _e('Category:') ?> <select name="cat_id" id="cat_id">
 <?php
-$categories = get_terms('link_category', 'get=all');
+$categories = get_terms('link_category', array('get' => 'all'));
 foreach ($categories as $category) {
 ?>

trunk/wp-admin/import/wordpress.php

@@ -303 +303 @@
                 global $wpdb;
 
-                $cat_names = (array) get_terms('category', 'fields=names');
+                $cat_names = (array) get_terms('category', array('fields' => 'names'));
 
                 while ( $c = array_shift($this->categories) ) {
@@ -333 +333 @@
                 global $wpdb;
 
-                $tag_names = (array) get_terms('post_tag', 'fields=names');
+                $tag_names = (array) get_terms('post_tag', array('fields' => 'names'));
 
                 while ( $c = array_shift($this->tags) ) {

trunk/wp-admin/import/wp-cat2tag.php

@@ -40 +40 @@
         function populate_cats() {
 
-                $categories = get_categories('get=all');
+                $categories = get_categories(array('get' => 'all'));
                 foreach ( $categories as $category ) {
                         $this->all_categories[] = $category;
@@ -50 +50 @@
         function populate_tags() {
 
-                $tags = get_terms( array('post_tag'), 'get=all' );
+                $tags = get_terms( array('post_tag'), array('get' => 'all') );
                 foreach ( $tags as $tag ) {
                         $this->all_tags[] = $tag;

trunk/wp-admin/includes/bookmark.php

@@ -103 +103 @@
 function wp_get_link_cats( $link_id = 0 ) {
 
-        $cats = wp_get_object_terms( $link_id, 'link_category', 'fields=ids' );
+        $cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
 
         return array_unique( $cats );

trunk/wp-admin/includes/export.php

@@ -44 +44 @@
 $post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
 
-$categories = (array) get_categories('get=all');
-$tags = (array) get_tags('get=all');
+$categories = (array) get_categories(array('get' => 'all'));
+$tags = (array) get_tags(array('get' => 'all'));
 
 $custom_taxonomies = $wp_taxonomies;
@@ -77 +77 @@
 
 while ( $parents = wxr_missing_parents($categories) ) {
-        $found_parents = get_categories("include=" . join(', ', $parents));
+        $found_parents = get_categories(array('include' => join(', ', $parents)));
         if ( is_array($found_parents) && count($found_parents) )
                 $categories = array_merge($categories, $found_parents);

trunk/wp-admin/includes/template.php

@@ -509 +509 @@
 
         if ( $descendants_and_self ) {
-                $categories = get_categories( "child_of=$descendants_and_self&hierarchical=0&hide_empty=0" );
+                $categories = get_categories(array('child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0));
                 $self = get_category( $descendants_and_self );
                 array_unshift( $categories, $self );
         } else {
-                $categories = get_categories('get=all');
+                $categories = get_categories(array('get' => 'all'));
         }
 
@@ -613 +613 @@
         }
 
-        $categories = get_terms('link_category', 'orderby=count&hide_empty=0');
+        $categories = get_terms('link_category', array('orderby' => 'count', 'hide_empty' => 0));
 
         if ( empty($categories) )

trunk/wp-admin/link-manager.php

@@ -108 +108 @@
 
 <?php
-$categories = get_terms('link_category', "hide_empty=1");
+$categories = get_terms('link_category', array("hide_empty" => 1));
 $select_cat = "<select name=\"cat_id\">\n";
 $select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('View all Categories') . "</option>\n";

trunk/wp-app.php

@@ -375 +375 @@
 
                 $categories = "";
-                $cats = get_categories("hierarchical=0&hide_empty=0");
+                $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0));
                 foreach ((array) $cats as $cat) {
                         $categories .= "    <category term=\"" . esc_attr($cat->name) .  "\" />\n";

trunk/wp-includes/bookmark.php

@@ -34 +34 @@
                 } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
                         $_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-                        $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', 'fields=ids') );
+                        $_bookmark->link_category = array_unique( wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')) );
                         wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
                 }

trunk/wp-includes/category.php

@@ -16 +16 @@
 function get_all_category_ids() {
         if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-                $cat_ids = get_terms( 'category', 'fields=ids&get=all' );
+                $cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
                 wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
         }
@@ -114 +114 @@
                 $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
 
-        $categories = get_terms( 'category', "get=all&slug=$leaf_path" );
+        $categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
 
         if ( empty( $categories ) )

trunk/wp-includes/deprecated.php

@@ -987 +987 @@
                 $category = '';
 
-        $results = get_bookmarks("category=$category&orderby=$orderby&order=$order&show_updated=$show_updated&limit=$limit");
+        $results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
         if ( !$results )
@@ -1084 +1084 @@
                 $direction = '';
 
-        $cats = get_categories("type=link&orderby=$order&order=$direction&hierarchical=0");
+        $cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
         // Display each category

trunk/wp-includes/link-template.php

@@ -934 +934 @@
 
                 if ( $in_same_cat ) {
-                        $cat_array = wp_get_object_terms($post->ID, 'category', 'fields=ids');
+                        $cat_array = wp_get_object_terms($post->ID, 'category', array('fields' => 'ids'));
                         $join .= " AND tt.taxonomy = 'category' AND tt.term_id IN (" . implode(',', $cat_array) . ")";
                 }
@@ -1076 +1076 @@
         if ( !empty($in_same_cat) || !empty($excluded_categories) ) {
                 if ( !empty($in_same_cat) ) {
-                        $cat_array = wp_get_object_terms($post->ID, 'category', 'fields=ids');
+                        $cat_array = wp_get_object_terms($post->ID, 'category', array('fields' => 'ids'));
                 }
 

trunk/wp-includes/post.php

@@ -1896 +1896 @@
         // Update counts for the post's terms.
         foreach ( (array) get_object_taxonomies('post') as $taxonomy ) {
-                $tt_ids = wp_get_object_terms($post_id, $taxonomy, 'fields=tt_ids');
+                $tt_ids = wp_get_object_terms($post_id, $taxonomy, array('fields' => 'tt_ids'));
                 wp_update_term_count($tt_ids, $taxonomy);
         }

trunk/wp-includes/taxonomy.php

@@ -1080 +1080 @@
 
         foreach ( (array) $taxonomies as $taxonomy ) {
-                $tt_ids = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
+                $tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
                 $in_tt_ids = "'" . implode("', '", $tt_ids) . "'";
                 do_action( 'delete_term_relationships', $object_id, $tt_ids );
@@ -1511 +1511 @@
                 $values = array();
                 $term_order = 0;
-                $final_tt_ids = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
+                $final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
                 foreach ( $tt_ids as $tt_id )
                         if ( in_array($tt_id, $final_tt_ids) )
@@ -1959 +1959 @@
                 return false;
 
-        $terms = wp_get_object_terms($ids, $taxonomies, 'fields=all_with_object_id');
+        $terms = wp_get_object_terms($ids, $taxonomies, array('fields' => 'all_with_object_id'));
 
         $object_terms = array();
@@ -2030 +2030 @@
 
         $children = array();
-        $terms = get_terms($taxonomy, 'get=all');
+        $terms = get_terms($taxonomy, array('get' => 'all'));
         foreach ( $terms as $term ) {
                 if ( $term->parent > 0 )

trunk/wp-links-opml.php

@@ -37 +37 @@
 
 if (empty ($link_cat))
-        $cats = get_categories("type=link&hierarchical=0");
+        $cats = get_categories(array('type' => 'link', 'hierarchical' => 0));
 else
-        $cats = get_categories('type=link&hierarchical=0&include='.$link_cat);
+        $cats = get_categories(array('type' => 'link', 'hierarchical' => 0, 'include' => $link_cat));
 
 foreach ((array) $cats as $cat) {
@@ -48 +48 @@
 <?php
 
-        $bookmarks = get_bookmarks("category={$cat->term_id}");
+        $bookmarks = get_bookmarks(array("category" => $cat->term_id));
         foreach ((array) $bookmarks as $bookmark) {
                 $title = esc_attr(apply_filters('link_title', $bookmark->link_name));

trunk/xmlrpc.php

@@ -2807 +2807 @@
                 $categories_struct = array();
 
-                if ( $cats = get_categories('get=all') ) {
+                if ( $cats = get_categories(array('get' => 'all')) ) {
                         foreach ( $cats as $cat ) {
                                 $struct['categoryId'] = $cat->term_id;
@@ -2999 +2999 @@
                 $categories_struct = array();
 
-                if ( $cats = get_categories('hide_empty=0&hierarchical=0') ) {
+                if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
                         foreach ($cats as $cat) {
                                 $struct['categoryId'] = $cat->term_id;