Changeset 5938

Timestamp:

08/24/2007 06:41:01 PM (17 years ago)

Author:

ryan

Message:

Don't pass cat as ref. Fix some term sanitization. fixes #4702

Location:

trunk

Files:

• wp-admin/includes/taxonomy.php (modified) (2 diffs)
• wp-includes/category.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-admin/includes/taxonomy.php

@@ -13 +13 @@
 
 function get_category_to_edit( $id ) {
-    $category = get_category( $id );
-
-    $category->term_id = (int) $category->term_id;
-    $category->parent = (int) $category->parent;
-
+    $category = get_category( $id, OBJECT, 'edit' );
     return $category;
 }
@@ -91 +87 @@
 
     $parent = (int) $parent;
-    if ( empty($parent) || !get_category( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
+    if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
         $parent = 0;
 

trunk/wp-includes/category.php

@@ -29 +29 @@
 // Retrieves category data given a category ID or category object.
 // Handles category caching.
-function &get_category(&$category, $output = OBJECT) {
-    $category = get_term($category, 'category', $output);
+function &get_category($category, $output = OBJECT, $filter = 'raw') {
+    $category = get_term($category, 'category', $output, $filter);
 
     _make_cat_compat($category);

trunk/wp-includes/taxonomy.php

@@ -230 +230 @@
  *      might be inaccurate or wrong.
  */
-function &get_term(&$term, $taxonomy, $output = OBJECT, $filter = 'raw') {
+function &get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
     global $wpdb;
 
@@ -885 +885 @@
     $term = get_term ($term_id, $taxonomy, ARRAY_A);
 
-    $term = sanitize_term($term, $taxonomy, 'db');
-
     // Escape data pulled from DB.
     $term = add_magic_quotes($term);
@@ -895 +893 @@
     $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
     $args = wp_parse_args($args, $defaults);
+    $args = sanitize_term($args, $taxonomy, 'db');
     extract($args, EXTR_SKIP);
 
     if ( empty($slug) )
         $slug = sanitize_title($name);
-    else
-        $slug = sanitize_title($slug);
 
     if ( $alias_of ) {