Changeset 9481

Timestamp:

11/02/2008 11:52:49 PM (17 years ago)

Author:

ryan

Message:

Warning fixes

Location:

trunk

Files:

• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/includes/taxonomy.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/edit-link-categories.php

@@ -182 +182 @@
 
 <?php if ( current_user_can('manage_categories') ) {
-    do_action('add_link_category_form_pre', $category); ?>
+    $category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?>
 
 <div class="form-wrap">

trunk/wp-admin/includes/taxonomy.php

@@ -110 +110 @@
 function wp_insert_category($catarr, $wp_error = false) {
     $cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
-    $cat_arr = wp_parse_args($cat_arr, $cat_defaults);
+    $catarr = wp_parse_args($catarr, $cat_defaults);
     extract($catarr, EXTR_SKIP);
 
@@ -168 +168 @@
     $cat_ID = (int) $catarr['cat_ID'];
 
-    if ( $cat_ID == $catarr['category_parent'] )
+    if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
         return false;
 

trunk/wp-includes/taxonomy.php

@@ -328 +328 @@
         return $_term;
     } elseif ( $output == ARRAY_A ) {
-        return get_object_vars($_term);
+        $__term = get_object_vars($_term);
+        return $__term;
     } elseif ( $output == ARRAY_N ) {
-        return array_values(get_object_vars($_term));
+        $__term = array_values(get_object_vars($_term));
+        return $__term;
     } else {
         return $_term;