Changeset 2690

Timestamp:

07/03/2005 01:03:13 AM (19 years ago)

Author:

ryan

Message:

Another attempt to fix xmlrpc category handling for ecto.

Location:

branches/1.5

Files:

• wp-includes/functions-post.php (modified) (3 diffs)
• xmlrpc.php (modified) (2 diffs)

branches/1.5/wp-includes/functions-post.php

@@ -104 +104 @@
 
     // First get all of the original fields
-    extract(wp_get_single_post($postarr['ID'], ARRAY_A));   
-
-    // Now overwrite any changed values being passed in
+    $post = wp_get_single_post($postarr['ID'], ARRAY_A);
+
+    // Escape data pulled from DB.
+    $post = add_magic_quotes($post);
+    extract($post);
+
+    // Now overwrite any changed values being passed in. These are 
+    // already escaped.
     extract($postarr);
 
-    // Make sure we set a valid category
+    // If no categories were passed along, use the current cats.
     if ( 0 == count($post_category) || !is_array($post_category) )
-        $post_category = array(get_option('default_category'));
+        $post_category = $post['post_category'];
 
     $post_modified = current_time('mysql');
@@ -150 +155 @@
     $result = $wpdb->get_col($sql);
 
+    if ( !$result )
+        $result = array();
+
     return array_unique($result);
 }
@@ -156 +164 @@
     global $wpdb;
     // If $post_categories isn't already an array, make it one:
-    if (!is_array($post_categories)) {
-        if (!$post_categories) {
-            $post_categories = get_option('default_category');
-        }
-        $post_categories = array($post_categories);
-    }
+    if (!is_array($post_categories) || 0 == count($post_categories))
+        $post_categories = array(get_option('default_category'));
 
     $post_categories = array_unique($post_categories);

branches/1.5/xmlrpc.php

@@ -563 +563 @@
           $post_category[] = get_cat_ID($cat);
         }
-      } else if ( !empty($catnames) ) {
-            $post_category = array(get_cat_ID($catnames));
-        }
+      }
         
       // We've got all the data -- post it:
@@ -621 +619 @@
           $post_category[] = get_cat_ID($cat);
         }
-      } else if ( !empty($catnames) ) {
-            $post_category = array(get_cat_ID($catnames));
-        }
+      }
 
       $post_excerpt = $content_struct['mt_excerpt'];