Changeset 3570 for trunk/wp-admin/admin-functions.php

Timestamp:

02/27/2006 04:57:30 AM (19 years ago)

Author:

ryan

Message:

Bookmark/link rework. #2499

File:

• trunk/wp-admin/admin-functions.php (modified) (9 diffs)

trunk/wp-admin/admin-functions.php

@@ -477 +477 @@
     $link->link_notes = wp_specialchars($link->link_notes);
     $link->link_rss = wp_specialchars($link->link_rss);
+    $link->post_category = $link->link_category;
 
     return $link;
@@ -492 +493 @@
         $link->link_name = '';
 
+    $link->link_visible = 'Y';
+
     return $link;
 }
@@ -508 +511 @@
     $_POST['link_image'] = wp_specialchars($_POST['link_image']);
     $_POST['link_rss'] = wp_specialchars($_POST['link_rss']);
-    $auto_toggle = get_autotoggle($_POST['link_category']);
-
-    // if we are in an auto toggle category and this one is visible then we
-    // need to make the others invisible before we add this new one.
-    // FIXME Add category toggle func.
-    //if (($auto_toggle == 'Y') && ($link_visible == 'Y')) {
-    //  $wpdb->query("UPDATE $wpdb->links set link_visible = 'N' WHERE link_category = $link_category");
-    //}
+    $_POST['link_category'] = $_POST['post_category'];
 
     if ( !empty($link_id) ) {
@@ -555 +551 @@
 
 function get_nested_categories($default = 0, $parent = 0) {
-    global $post_ID, $mode, $wpdb;
+    global $post_ID, $link_id, $mode, $wpdb;
 
     if ($post_ID) {
@@ -568 +564 @@
             $checked_categories[] = $default;
         }
-
+    } else if ($link_id) {
+        $checked_categories = $wpdb->get_col("
+             SELECT category_id
+             FROM $wpdb->categories, $wpdb->link2cat
+             WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
+             ");
+
+        if (count($checked_categories) == 0) {
+            // No selected categories, strange
+            $checked_categories[] = $default;
+        }   
     } else {
         $checked_categories[] = $default;
@@ -621 +627 @@
                     $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__('Edit')."</a></td>";
                     $default_cat_id = get_option('default_category');
-
-                    if ($category->cat_ID != $default_cat_id)
-                        $edit .= "<td><a href='categories.php?action=delete&amp;cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '".sprintf(__("You are about to delete the category &quot;%s&quot;.  All of its posts will go to the default category.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars($category->cat_name, 1))."' );\" class='delete'>".__('Delete')."</a>";
+                    $default_link_cat_id = get_option('default_link_category');
+
+                    if ( ($category->cat_ID != $default_cat_id) && ($category->cat_ID != $default_link_cat_id) )
+                        $edit .= "<td><a href='categories.php?action=delete&amp;cat_ID=$category->cat_ID' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '".sprintf(__("You are about to delete the category &quot;%s&quot;.  All of its posts and bookmarks will go to the default categories.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars($category->cat_name, 1))."' );\" class='delete'>".__('Delete')."</a>";
                     else
                         $edit .= "<td style='text-align:center'>".__("Default");
@@ -634 +641 @@
                                 <td>$category->category_description</td>
                                 <td>$category->category_count</td>
+                                <td>$category->link_count</td>
                                 <td>$edit</td>
                                 </tr>";
@@ -688 +696 @@
         foreach ($categories as $category) {
             if ($currentcat != $category->cat_ID && $parent == $category->category_parent) {
-                $count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
                 $pad = str_repeat('&#8211; ', $level);
                 $category->cat_name = wp_specialchars($category->cat_name);
@@ -703 +710 @@
 }
 
-function link_category_dropdown($fieldname, $selected = 0) {
+function return_link_categories_list($parent = 0) {
     global $wpdb;
-
-    $results = $wpdb->get_results("SELECT cat_id, cat_name, auto_toggle FROM $wpdb->linkcategories ORDER BY cat_id");
-    echo "\n<select name='$fieldname' size='1'>\n";
-    foreach ($results as $row) {
-        echo "\n\t<option value='$row->cat_id'";
-        if ($row->cat_id == $selected)
-            echo " selected='selected'";
-        echo ">$row->cat_id : " . wp_specialchars($row->cat_name);
-        if ($row->auto_toggle == 'Y')
-            echo ' (auto toggle)';
-        echo "</option>";
-    }
-    echo "\n</select>\n";
+    return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY link_count DESC LIMIT 100");
 }