1 files changed, 98 insertions, 236 deletions

diff --git a/wp-includes/category.php b/wp-includes/category.php
index fcfb60f..71e5be8 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -4,7 +4,7 @@ function get_all_category_ids() {
 	global $wpdb;
 
 	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
-		$cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
+		$cat_ids = get_terms('category', 'fields=ids&get=all');
 		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
@@ -12,162 +12,30 @@ function get_all_category_ids() {
 }
 
 function &get_categories($args = '') {
-	global $wpdb, $category_links;
-
-	if ( is_array($args) )
-		$r = &$args;
-	else
-		parse_str($args, $r);
-
-	$defaults = array('type' => 'post', 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC',
-		'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'include' => '',
-		'number' => '', 'pad_counts' => false);
-	$r = array_merge($defaults, $r);
-	if ( 'count' == $r['orderby'] )
-		$r['orderby'] = 'category_count';
-	else
-		$r['orderby'] = "cat_" . $r['orderby'];  // restricts order by to cat_ID and cat_name fields
-	$r['number'] = (int) $r['number'];
-	extract($r, EXTR_SKIP);
-
-	$key = md5( serialize( $r ) );
-	if ( $cache = wp_cache_get( 'get_categories', 'category' ) )
-		if ( isset( $cache[ $key ] ) )
-			return apply_filters('get_categories', $cache[$key], $r);
-
-	$where = 'cat_ID > 0';
-	$inclusions = '';
-	if ( !empty($include) ) {
-		$child_of = 0; //ignore child_of and exclude params if using include
-		$exclude = '';
-		$incategories = preg_split('/[\s,]+/',$include);
-		if ( count($incategories) ) {
-			foreach ( $incategories as $incat ) {
-				if (empty($inclusions))
-					$inclusions = ' AND ( cat_ID = ' . intval($incat) . ' ';
-				else
-					$inclusions .= ' OR cat_ID = ' . intval($incat) . ' ';
-			}
-		}
-	}
-	if (!empty($inclusions))
-		$inclusions .= ')';
-	$where .= $inclusions;
-
-	$exclusions = '';
-	if ( !empty($exclude) ) {
-		$excategories = preg_split('/[\s,]+/',$exclude);
-		if ( count($excategories) ) {
-			foreach ( $excategories as $excat ) {
-				if (empty($exclusions))
-					$exclusions = ' AND ( cat_ID <> ' . intval($excat) . ' ';
-				else
-					$exclusions .= ' AND cat_ID <> ' . intval($excat) . ' ';
-				// TODO: Exclude children of excluded cats?   Note: children are getting excluded
-			}
-		}
-	}
-	if (!empty($exclusions))
-		$exclusions .= ')';
-	$exclusions = apply_filters('list_cats_exclusions', $exclusions, $r );
-	$where .= $exclusions;
-
-	if ( $hide_empty && !$hierarchical ) {
-		if ( 'link' == $type )
-			$where .= ' AND link_count > 0';
-		else
-			$where .= ' AND category_count > 0';
-	}
-
-	if ( !empty($number) )
-		$number = 'LIMIT ' . $number;
-	else
-		$number = '';
-
-	$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE $where ORDER BY $orderby $order $number");
-
-	if ( empty($categories) )
-		return array();
-
-	// TODO: Integrate this into the main query.
-	if ( $include_last_update_time ) {
-		$stamps = $wpdb->get_results("SELECT category_id, UNIX_TIMESTAMP( MAX(post_date) ) AS ts FROM $wpdb->posts, $wpdb->post2cat, $wpdb->categories
-							WHERE post_status = 'publish' AND post_id = ID AND $where GROUP BY category_id");
-		global $cat_stamps;
-		foreach ($stamps as $stamp)
-			$cat_stamps[$stamp->category_id] = $stamp->ts;
-		function stamp_cat($cat) {
-			global $cat_stamps;
-			$cat->last_update_timestamp = $cat_stamps[$cat->cat_ID];
-			return $cat;
-		}
-		$categories = array_map('stamp_cat', $categories);
-		unset($cat_stamps);
-	}
-
-	if ( $child_of || $hierarchical ) {
-		$children = _get_category_hierarchy();
-		if ( ! empty($children) )
-			$categories = & _get_cat_children($child_of, $categories);
-	}
+	$defaults = array('type' => 'category');
+	$args = wp_parse_args($args, $defaults);
 
-	// Update category counts to include children.
-	if ( $pad_counts )
-		_pad_category_counts($type, $categories);
-
-	// Make sure we show empty categories that have children.
-	if ( $hierarchical && $hide_empty ) {
-		foreach ( $categories as $k => $category ) {
-			if ( ! $category->{'link' == $type ? 'link_count' : 'category_count'} ) {
-				$children = _get_cat_children($category->cat_ID, $categories);
-				foreach ( $children as $child )
-					if ( $child->{'link' == $type ? 'link_count' : 'category_count'} )
-						continue 2;
-
-				// It really is empty
-				unset($categories[$k]);
-			}
-		}
-	}
-	reset ( $categories );
+	$taxonomy = 'category';
+	if ( 'link' == $args['type'] )
+		$taxonomy = 'link_category';
+	$categories = get_terms($taxonomy, $args);
 
-	$cache[ $key ] = $categories;
-	wp_cache_add( 'get_categories', $cache, 'category' );
+	foreach ( array_keys($categories) as $k )
+		_make_cat_compat($categories[$k]);
 
-	$categories = apply_filters('get_categories', $categories, $r);
 	return $categories;
 }
 
 // Retrieves category data given a category ID or category object.
 // Handles category caching.
-function &get_category(&$category, $output = OBJECT) {
-	global $wpdb;
+function &get_category($category, $output = OBJECT, $filter = 'raw') {
+	$category = get_term($category, 'category', $output, $filter);
+	if ( is_wp_error( $category ) )
+		return $category;
 
-	if ( empty($category) )
-		return null;
+	_make_cat_compat($category);
 
-	if ( is_object($category) ) {
-		wp_cache_add($category->cat_ID, $category, 'category');
-		$_category = $category;
-	} else {
-		$category = (int) $category;
-		if ( ! $_category = wp_cache_get($category, 'category') ) {
-			$_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category' LIMIT 1");
-			wp_cache_add($category, $_category, 'category');
-		}
-	}
-
-	$_category = apply_filters('get_category', $_category);
-
-	if ( $output == OBJECT ) {
-		return $_category;
-	} elseif ( $output == ARRAY_A ) {
-		return get_object_vars($_category);
-	} elseif ( $output == ARRAY_N ) {
-		return array_values(get_object_vars($_category));
-	} else {
-		return $_category;
-	}
+	return $category;
 }
 
 function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
@@ -182,7 +50,7 @@ function get_category_by_path($category_path, $full_match = true, $output = OBJE
 	foreach ( (array) $category_paths as $pathdir )
 		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
 
-	$categories = $wpdb->get_results("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE category_nicename = '$leaf_path'");
+	$categories = get_terms('category', "get=all&slug=$leaf_path");
 
 	if ( empty($categories) )
 		return NULL;
@@ -190,29 +58,40 @@ function get_category_by_path($category_path, $full_match = true, $output = OBJE
 	foreach ($categories as $category) {
 		$path = '/' . $leaf_path;
 		$curcategory = $category;
-		while ( ($curcategory->category_parent != 0) && ($curcategory->category_parent != $curcategory->cat_ID) ) {
-			$curcategory = $wpdb->get_row("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE cat_ID = '$curcategory->category_parent'");
-			$path = '/' . $curcategory->category_nicename . $path;
+		while ( ($curcategory->parent != 0) && ($curcategory->parent != $curcategory->term_id) ) {
+			$curcategory = get_term($curcategory->parent, 'category');
+			if ( is_wp_error( $curcategory ) )
+				return $curcategory;
+			$path = '/' . $curcategory->slug . $path;
 		}
 
 		if ( $path == $full_path )
-			return get_category($category->cat_ID, $output);
+			return get_category($category->term_id, $output);
 	}
 
 	// If full matching is not required, return the first cat that matches the leaf.
 	if ( ! $full_match )
-		return get_category($categories[0]->cat_ID, $output);
+		return get_category($categories[0]->term_id, $output);
 
 	return NULL;
 }
 
+function get_category_by_slug( $slug  ) {
+	$category = get_term_by('slug', $slug, 'category');
+	if ( $category )
+		_make_cat_compat($category);
+
+	return $category;
+}
+
 // Get the ID of a category from its name
 function get_cat_ID($cat_name='General') {
 	global $wpdb;
 
-	$cid = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");
-
-	return $cid?$cid:1;	// default to cat 1
+	$cat = get_term_by('name', $cat_name, 'category');
+	if ($cat)
+		return $cat->term_id;
+	return 0;
 }
 
 // Deprecate
@@ -224,108 +103,91 @@ function get_catname($cat_ID) {
 function get_cat_name($cat_id) {
 	$cat_id = (int) $cat_id;
 	$category = &get_category($cat_id);
-	return $category->cat_name;
+	return $category->name;
 }
 
-function cat_is_ancestor_of($cat1, $cat2) { 
-	if ( is_int($cat1) ) 
-		$cat1 = & get_category($cat1); 
-	if ( is_int($cat2) ) 
-		$cat2 = & get_category($cat2); 
+function cat_is_ancestor_of($cat1, $cat2) {
+	if ( is_int($cat1) )
+		$cat1 = & get_category($cat1);
+	if ( is_int($cat2) )
+		$cat2 = & get_category($cat2);
 
-	if ( !$cat1->cat_ID || !$cat2->category_parent ) 
-		return false; 
+	if ( !$cat1->term_id || !$cat2->parent )
+		return false;
 
-	if ( $cat2->category_parent == $cat1->cat_ID ) 
-		return true; 
+	if ( $cat2->parent == $cat1->term_id )
+		return true;
 
-	return cat_is_ancestor_of($cat1, get_category($cat2->parent_category)); 
-} 
+	return cat_is_ancestor_of($cat1, get_category($cat2->parent));
+}
 
-//
-// Private
-//
+function sanitize_category($category, $context = 'display') {
+	return sanitize_term($category, 'category', $context);
+}
 
-function &_get_cat_children($category_id, $categories) {
-	if ( empty($categories) )
-		return array();
+function sanitize_category_field($field, $value, $cat_id, $context) {
+	return sanitize_term_field($field, $value, $cat_id, 'category', $context);
+}
 
-	$category_list = array();
-	$has_children = _get_category_hierarchy();
+// Tags
 
-	if  ( ( 0 != $category_id ) && ! isset($has_children[$category_id]) )
-		return array();
+function &get_tags($args = '') {
+	global $wpdb, $category_links;
 
-	foreach ( $categories as $category ) {
-		if ( $category->cat_ID == $category_id )
-			continue;
+	$key = md5( serialize( $args ) );
+	if ( $cache = wp_cache_get( 'get_tags', 'category' ) )
+		if ( isset( $cache[ $key ] ) )
+			return apply_filters('get_tags', $cache[$key], $args);
 
-		if ( $category->category_parent == $category_id ) {
-			$category_list[] = $category;
 
-			if ( !isset($has_children[$category->cat_ID]) )
-				continue;
+	$tags = get_terms('post_tag', $args);
 
-			if ( $children = _get_cat_children($category->cat_ID, $categories) )
-				$category_list = array_merge($category_list, $children);
-		}
-	}
+	if ( empty($tags) )
+		return array();
 
-	return $category_list;
-}
+	$cache[ $key ] = $tags;
+	wp_cache_set( 'get_tags', $cache, 'category' );
 
-// Recalculates link or post counts by including items from child categories
-// Assumes all relevant children are already in the $categories argument
-function _pad_category_counts($type, &$categories) {
-	global $wpdb;
+	$tags = apply_filters('get_tags', $tags, $args);
+	return $tags;
+}
 
-	// Set up some useful arrays
-	foreach ( $categories as $key => $cat ) {
-		$cats[$cat->cat_ID] = & $categories[$key];
-		$cat_IDs[] = $cat->cat_ID;
-	}
+function &get_tag($tag, $output = OBJECT, $filter = 'raw') {
+	return get_term($tag, 'post_tag', $output, $filter);
+}
 
-	// Get the relevant post2cat or link2cat records and stick them in a lookup table
-	if ( $type == 'post' ) {
-		$results = $wpdb->get_results("SELECT post_id, category_id FROM $wpdb->post2cat LEFT JOIN $wpdb->posts ON post_id = ID WHERE category_id IN (".join(',', $cat_IDs).") AND post_type = 'post' AND post_status = 'publish'");
-		foreach ( $results as $row )
-			++$cat_items[$row->category_id][$row->post_id];
-	} else {
-		$results = $wpdb->get_results("SELECT $wpdb->link2cat.link_id, category_id FROM $wpdb->link2cat LEFT JOIN $wpdb->links USING (link_id) WHERE category_id IN (".join(',', $cat_IDs).") AND link_visible = 'Y'");
-		foreach ( $results as $row )
-			++$cat_items[$row->category_id][$row->link_id];
-	}
+//
+// Cache
+//
 
-	// Touch every ancestor's lookup row for each post in each category
-	foreach ( $cat_IDs as $cat_ID ) {
-		$child = $cat_ID;
-		while ( $parent = $cats[$child]->category_parent ) {
-			if ( !empty($cat_items[$cat_ID]) )
-				foreach ( $cat_items[$cat_ID] as $item_id => $touches )
-					++$cat_items[$parent][$item_id];
-			$child = $parent;
-		}
-	}
+function update_category_cache() {
+	return true;
+}
 
-	// Transfer the touched cells 
-	foreach ( (array) $cat_items as $id => $items )
-		if ( isset($cats[$id]) )
-			$cats[$id]->{'link' == $type ? 'link_count' : 'category_count'} = count($items);
+function clean_category_cache($id) {
+	clean_term_cache($id, 'category');
 }
 
-function _get_category_hierarchy() {
-	$children = get_option('category_children');
-	if ( is_array($children) )
-		return $children;
+//
+// Private helpers
+//
 
-	$children = array();
-	$categories = get_categories('hide_empty=0&hierarchical=0');
-	foreach ( $categories as $cat ) {
-		if ( $cat->category_parent > 0 )
-			$children[$cat->category_parent][] = $cat->cat_ID;
+function _make_cat_compat( &$category) {
+	if ( is_object($category) ) {
+		$category->cat_ID = &$category->term_id;
+		$category->category_count = &$category->count;
+		$category->category_description = &$category->description;
+		$category->cat_name = &$category->name;
+		$category->category_nicename = &$category->slug;
+		$category->category_parent = &$category->parent;
+	} else if ( is_array($category) && isset($category['term_id']) ) {
+		$category['cat_ID'] = &$category['term_id'];
+		$category['category_count'] = &$category['count'];
+		$category['category_description'] = &$category['description'];
+		$category['cat_name'] = &$category['name'];
+		$category['category_nicename'] = &$category['slug'];
+		$category['category_parent'] = &$category['parent'];
 	}
-	update_option('category_children', $children);
-
-	return $children;
 }
+
 ?>