Changeset 5563

Timestamp:

05/27/2007 07:32:45 PM (16 years ago)

Author:

ryan

Message:

Fix up exporter. Remove more refrences to the categories table. see #4189

Location:

trunk

Files:

• wp-admin/export.php (modified) (6 diffs)
• wp-admin/index.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (5 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/export.php

@@ -62 +62 @@
 $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
 
-$categories = (array) $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename, category_description, category_parent, posts_private, links_private FROM $wpdb->categories LEFT JOIN $wpdb->post2cat ON (category_id = cat_id) LEFT JOIN $wpdb->posts ON (post_id <=> id) $where GROUP BY cat_id");
+$categories = (array) get_categories('get=all');
 
 function wxr_missing_parents($categories) {
@@ -69 +69 @@
 
     foreach ( $categories as $category )
-        $parents[$category->cat_ID] = $category->category_parent;
+        $parents[$category->term_id] = $category->parent;
 
     $parents = array_unique(array_diff($parents, array_keys($parents)));
@@ -80 +80 @@
 
 while ( $parents = wxr_missing_parents($categories) ) {
-    $found_parents = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename, category_description, category_parent, posts_private, links_private FROM $wpdb->categories WHERE cat_ID IN (" . join(', ', $parents) . ")");
+    $found_parents = get_categories("include=" . join(', ', $parents));
     if ( is_array($found_parents) && count($found_parents) )
         $categories = array_merge($categories, $found_parents);
@@ -91 +91 @@
 $passes = 1000 + count($categories);
 while ( ( $cat = array_shift($categories) ) && ++$pass < $passes ) {
-    if ( $cat->category_parent == 0 || isset($cats[$cat->category_parent]) ) {
-        $cats[$cat->cat_ID] = $cat;
+    if ( $cat->parent == 0 || isset($cats[$cat->parent]) ) {
+        $cats[$cat->term_id] = $cat;
     } else {
         $categories[] = $cat;
@@ -111 +111 @@
 
 function wxr_cat_name($c) {
-    if ( empty($c->cat_name) )
+    if ( empty($c->name) )
         return;
 
-    echo '<wp:cat_name>' . wxr_cdata($c->cat_name) . '</wp:cat_name>';
+    echo '<wp:cat_name>' . wxr_cdata($c->name) . '</wp:cat_name>';
 }
 
 function wxr_category_description($c) {
-    if ( empty($c->category_description) )
+    if ( empty($c->description) )
         return;
 
-    echo '<wp:category_description>' . wxr_cdata($c->category_description) . '</wp:category_description>';
+    echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
 }
 
@@ -164 +164 @@
     <language><?php echo get_option('rss_language'); ?></language>
 <?php if ( $cats ) : foreach ( $cats as $c ) : ?>
-    <wp:category><wp:category_nicename><?php echo $c->category_nicename; ?></wp:category_nicename><wp:category_parent><?php echo $c->category_parent ? $cats[$c->category_parent]->cat_name : ''; ?></wp:category_parent><wp:posts_private><?php echo $c->posts_private ? '1' : '0'; ?></wp:posts_private><wp:links_private><?php echo $c->links_private ? '1' : '0'; ?></wp:links_private><?php wxr_cat_name($c); ?><?php wxr_category_description($c); ?></wp:category>
+    <wp:category><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->name : ''; ?></wp:category_parent><?php wxr_cat_name($c); ?><?php wxr_category_description($c); ?></wp:category>
 <?php endforeach; endif; ?>
     <?php do_action('rss2_head'); ?>

trunk/wp-admin/index.php

@@ -102 +102 @@
 $numposts = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
 $numcomms = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
-$numcats  = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories");
+$numcats  = wp_count_terms('category');
+$numtags = wp_count_terms('post_tag');
 
 $post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format_i18n($numposts), 'edit.php');
@@ -109 +110 @@
 ?>
 
-<p><?php printf(__('There are currently %1$s and %2$s, contained within %3$s.'), $post_str, $comm_str, $cat_str); ?></p>
+<p><?php printf(__('There are currently %1$s and %2$s, contained within %3$s and %4$s tags.'), $post_str, $comm_str, $cat_str, $numtags); ?></p>
 </div>
 

trunk/wp-includes/deprecated.php

@@ -57 +57 @@
     // Grab the first cat in the list.
     $categories = get_the_category();
-    $cat = $categories[0]->cat_ID;
+    $cat = $categories[0]->term_id;
 
     if ( $echo )
@@ -218 +218 @@
         global $wpdb;
         $cat_id = -1;
-        $results = $wpdb->get_results("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");
-        if ($results) {
-                foreach ($results as $result) {
-                        $cat_id = $result->cat_ID;
-                }
-        }
+        $cat = get_term_by('name', $cat_name, 'link_category');
+        if ( $cat )
+            $cat_id = $cat->term_id;
+
         get_links($cat_id, $before, $after, $between, $show_images, $orderby,
                             $show_description, $show_rating, $limit, $show_updated);
@@ -236 +234 @@
     global $wpdb;
 
-    $cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category' LIMIT 1");
-
-    if (! $cat_id)
-        return;
+    $cat = get_term_by('name', $cat_name, 'link_category');
+    if ( !$cat )
+        return false;
+    $cat_id = $cat->term_id;    
 
     $args = add_query_arg('category', $cat_id, $args);
@@ -264 +262 @@
  ** }
  **/
-// Deprecate in favor of get_linkz().
 function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
         global $wpdb;
         $cat_id = -1;
-        //$results = $wpdb->get_results("SELECT cat_id FROM $wpdb->linkcategories WHERE cat_name='$cat_name'");
-        // TODO: Fix me.
-        if ($results) {
-                foreach ($results as $result) {
-                        $cat_id = $result->cat_id;
-                }
-        }
+        $cat = get_term_by('name', $cat_name, 'link_category');
+        if ( $cat )
+            $cat_id = $cat->term_id;    
+
         return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -314 +308 @@
  **/
 // Deprecate in favor of get_linkz().
-function get_linkobjects($category = -1, $orderby = 'name', $limit = -1) {
+function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
         global $wpdb;
 
-        $sql = "SELECT * FROM $wpdb->links WHERE link_visible = 'Y'";
-        if ($category != -1) {
-                $sql .= " AND link_category = $category ";
+        $links = get_bookmarks("category=$category&orderby=$orderby&limit=$limit");
+
+        $links_array = array();
+        foreach ($links as $link) {
+            $links_array[] = $link; 
         }
-        if ($orderby == '')
-                $orderby = 'id';
-        if (substr($orderby,0,1) == '_') {
-                $direction = ' DESC';
-                $orderby = substr($orderby,1);
-        }
-        if (strcasecmp('rand',$orderby) == 0) {
-                $orderby = 'rand()';
-        } else {
-                $orderby = " link_" . $orderby;
-        }
-        $sql .= ' ORDER BY ' . $orderby;
-        $sql .= $direction;
-        /* The next 2 lines implement LIMIT TO processing */
-        if ($limit != -1)
-                $sql .= " LIMIT $limit";
-
-        $results = $wpdb->get_results($sql);
-        if ($results) {
-                foreach ($results as $result) {
-                        $result->link_url         = $result->link_url;
-                        $result->link_name        = $result->link_name;
-                        $result->link_description = $result->link_description;
-                        $result->link_notes       = $result->link_notes;
-                        $newresults[] = $result;
-                }
-        }
-        return $newresults;
+
+        return $links_array;
 }
 

trunk/wp-includes/general-template.php

@@ -186 +186 @@
                     $category_name = $category_name[count($category_name)-2]; // there was a trailling slash
         }
-        $title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
-        $title = apply_filters('single_cat_title', $title);
+        $cat = get_term_by('slug', $category_name, 'category');
+        if ( $cat )
+            $title = apply_filters('single_cat_title', $cat->name);
     }
 

trunk/wp-includes/taxonomy.php

@@ -34 +34 @@
     $args['object_type'] = $object_type;
     $wp_taxonomies[$taxonomy] = $args;
+}
+
+function wp_count_terms( $taxonomy ) {
+    global $wpdb;
+
+    return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = '$taxonomy'");
 }