Changeset 3849

Timestamp:

06/06/2006 05:04:41 AM (20 years ago)

Author:

ryan

Message:

Deprecate wp_get/set_post_cats() in favor of wp_get/set_post_categories().

Location:

trunk

Files:

• wp-admin/admin-db.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions-post.php (modified) (7 diffs)
• xmlrpc.php (modified) (7 diffs)

trunk/wp-admin/admin-db.php

@@ -188 +188 @@
         $posts = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE category_id='$cat_ID'");
         if ( is_array($posts) ) foreach ($posts as $post_id) {
-                $cats = wp_get_post_cats('', $post_id);
+                $cats = wp_get_post_categories($post_id);
                 if ( 1 == count($cats) )
                         $cats = array($default_cat);
                 else
                         $cats = array_diff($cats, array($cat_ID));
-                wp_set_post_cats('', $post_id, $cats); 
+                wp_set_post_categories($post_id, $cats); 
         }
 
@@ -231 +231 @@
 
         if ($post_id)
-                wp_set_post_cats('', $post_id, $cat_ids);
+                wp_set_post_categories($post_id, $cat_ids);
 
         return $cat_ids;

trunk/wp-includes/deprecated.php

@@ -463 +463 @@
 }
 
+function wp_get_post_cats($blogid = '1', $post_ID = 0) {
+        return wp_get_post_categories($post_ID);
+}
+
+function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
+        return wp_set_post_categories($post_ID, $post_categories);
+}
+
 ?>

trunk/wp-includes/functions-post.php

@@ -162 +162 @@
         }
 
-        wp_set_post_cats('', $post_ID, $post_category);
+        wp_set_post_categories($post_ID, $post_category);
 
         if ( 'page' == $post_type ) {
@@ -349 +349 @@
         }
 
-        wp_set_post_cats('', $post_ID, $post_category);
+        wp_set_post_categories($post_ID, $post_category);
 
         if ( $file )
@@ -412 +412 @@
         // Set categories
         if($mode == OBJECT) {
-                $post->post_category = wp_get_post_cats('',$postid);
+                $post->post_category = wp_get_post_categories($postid);
         } 
         else {
-                $post['post_category'] = wp_get_post_cats('',$postid);
+                $post['post_category'] = wp_get_post_categories($postid);
         }
 
@@ -487 +487 @@
 }
 
-function wp_get_post_cats($blogid = '1', $post_ID = 0) {
+function wp_get_post_categories($post_ID = 0) {
         global $wpdb;
 
@@ -505 +505 @@
 }
 
-function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
+function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
         global $wpdb;
         // If $post_categories isn't already an array, make it one:
@@ -556 +556 @@
                 wp_cache_delete($cat_id, 'category');
         }
-}       // wp_set_post_cats()
+}       // wp_set_post_categories()
 
 function wp_delete_post($postid = 0) {
@@ -571 +571 @@
 
         if ( 'publish' == $post->post_status && 'post' == $post->post_type ) {
-                $categories = wp_get_post_cats('', $post->ID);
+                $categories = wp_get_post_categories($post->ID);
                 if( is_array( $categories ) ) {
                         foreach ( $categories as $cat_id ) {

trunk/xmlrpc.php

@@ -243 +243 @@
           $post_data = wp_get_single_post($post_ID, ARRAY_A);
 
-          $categories = implode(',', wp_get_post_cats(1, $post_ID));
+          $categories = implode(',', wp_get_post_categories($post_ID));
 
           $content  = '<title>'.stripslashes($post_data['post_title']).'</title>';
@@ -286 +286 @@
           
             $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
-            $categories = implode(',', wp_get_post_cats(1, $entry['ID']));
+            $categories = implode(',', wp_get_post_categories($entry['ID']));
 
             $content  = '<title>'.stripslashes($entry['post_title']).'</title>';
@@ -696 +696 @@
 
             $categories = array();
-            $catids = wp_get_post_cats('', $post_ID);
+            $catids = wp_get_post_categories($post_ID);
             foreach($catids as $catid) {
               $categories[] = get_cat_name($catid);
@@ -756 +756 @@
             $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
             $categories = array();
-            $catids = wp_get_post_cats('', $entry['ID']);
+            $catids = wp_get_post_categories($entry['ID']);
             foreach($catids as $catid) {
               $categories[] = get_cat_name($catid);
@@ -959 +959 @@
 
           $categories = array();
-          $catids = wp_get_post_cats('', intval($post_ID));
+          $catids = wp_get_post_categories(intval($post_ID));
           // first listed category will be the primary category
           $isPrimary = true;
@@ -997 +997 @@
           }
 
-          wp_set_post_cats('', $post_ID, $catids);
+          wp_set_post_categories($post_ID, $catids);
 
           return true;
@@ -1080 +1080 @@
 
           // retain old cats
-          $cats = wp_get_post_cats('',$post_ID);
+          $cats = wp_get_post_categories($post_ID);
           $postdata['post_category'] = $cats;
                 $this->escape($postdata);