Changeset 5637

Timestamp:

06/02/2007 02:53:09 AM (17 years ago)

Author:

ryan

Message:

Separate AJAX cat adder into post and link flavors. see #4189

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/edit-link-form.php (modified) (1 diff)
• wp-admin/includes/bookmark.php (modified) (1 diff)
• wp-admin/includes/taxonomy.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/js/link-cat.js (added)
• wp-admin/link-add.php (modified) (1 diff)
• wp-admin/link.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -122 +122 @@
             'id' => $cat_id,
             'data' => "<li id='category-$cat_id'><label for='in-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='post_category[]' id='in-category-$cat_id'/> $cat_name</label></li>"
+        ) );
+    }
+    $x->send();
+    break;
+case 'add-link-category' : // On the Fly
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+    $names = explode(',', $_POST['newcat']);
+    $x = new WP_Ajax_Response();
+    foreach ( $names as $cat_name ) {
+        $cat_name = trim($cat_name);
+        if ( !$slug = sanitize_title($cat_name) )
+            die('0');
+        if ( !$cat_id = category_exists( $cat_name ) ) {
+            $cat_id = wp_insert_term( $cat_name, 'link_category' );
+            $cat_id = $cat_id['term_id'];
+        }
+        $cat_name = wp_specialchars(stripslashes($cat_name));
+        $x->add( array(
+            'what' => 'link-category',
+            'id' => $cat_id,
+            'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>"
         ) );
     }

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

@@ -44 +44 @@
 <div class="dbx-content">
 <p id="jaxcat"></p>
-<ul id="categorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
+<ul id="linkcategorychecklist"><?php dropdown_link_categories(get_option('default_link_category')); ?></ul>
 </div>
 </fieldset>

trunk/wp-admin/includes/bookmark.php

@@ -14 +14 @@
     $_POST['link_image'] = wp_specialchars( $_POST['link_image'] );
     $_POST['link_rss'] = clean_url($_POST['link_rss']);
-    $_POST['link_category'] = $_POST['post_category'];
 
     if ( !empty( $link_id ) ) {

trunk/wp-admin/includes/taxonomy.php

@@ -6 +6 @@
 
 function category_exists($cat_name) {
-    return is_term($cat_name, 'category');
+    $id = is_term($cat_name, 'category');
+    if ( is_array($id) )
+        $id = $id['term_id'];
+    return $id;
 }
 

trunk/wp-admin/includes/template.php

@@ -158 +158 @@
         $name = wp_specialchars( apply_filters('the_category', $category->name));
         $checked = in_array( $cat_id, $checked_categories );
-        echo '<li id="category-', $cat_id, '"><label for="in-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="post_category[]" id="in-category-', $cat_id, '"', ($checked ? ' checked="checked"' : "" ), '/> ', $name, "</label></li>";
+        echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', ($checked ? ' checked="checked"' : "" ), '/> ', $name, "</label></li>";
     }
 }

trunk/wp-admin/link-add.php

@@ -14 +14 @@
 wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
 if ( current_user_can( 'manage_categories' ) )
-    wp_enqueue_script( 'ajaxcat' );
+    wp_enqueue_script( 'ajaxlinkcat' );
 require('admin-header.php');
 ?>

trunk/wp-admin/link.php

@@ -94 +94 @@
         wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
         if ( current_user_can( 'manage_categories' ) )
-            wp_enqueue_script( 'ajaxcat' );
+            wp_enqueue_script( 'ajaxlinkcat' );
         $parent_file = 'link-manager.php';
         $submenu_file = 'link-manager.php';

trunk/wp-includes/script-loader.php

@@ -110 +110 @@
                 'how' => __('Separate multiple categories with commas.')
             ) );
+            $this->add( 'ajaxlinkcat', '/wp-admin/js/link-cat.js', array('listman'), '200700601' );
+            $this->localize( 'ajaxlinkcat', 'linkcatL10n', array(
+                'add' => attribute_escape(__('Add')),
+                'how' => __('Separate multiple categories with commas.')
+            ) );
             $this->add( 'admin-categories', '/wp-admin/js/categories.js', array('listman'), '3684' );
             $this->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('listman'), '3733' );