Changeset 5289 for branches/2.2/wp-includes/category.php

Timestamp:

04/19/2007 10:26:52 PM (19 years ago)

Author:

markjaquith

Message:

Roll tags out of 2.2 -- reverts [5272], [5271], [5257], [5254], [5253], [5251], [5250], [5243], [5235], [5234], [5232], [5231], [5229], [5228], [5217], [5216], [5215], [5213], half of [5210], [5209], [5205], [5203], [5201], [5196], [5184], [5168], [5163], [5162], [5150], [5149], [5148], [5147], [5113], [5112], [5111], and [5110]

File:

• branches/2.2/wp-includes/category.php (modified) (4 diffs)

branches/2.2/wp-includes/category.php

@@ -1 +1 @@
 <?php
-
-define('TAXONOMY_CATEGORY', 1);
-define('TAXONOMY_TAG', 2);
 
 function get_all_category_ids() {
@@ -81 +78 @@
         else
             $where .= ' AND category_count > 0';
-    } else {
-        $where .= ' AND ( type & ' . TAXONOMY_CATEGORY . ' != 0 ) ';
-    }
-
-    
+    }
 
     if ( !empty($number) )
@@ -214 +207 @@
 }
 
-function get_category_by_slug( $slug  ) {
-    global $wpdb;
-    $slug = sanitize_title( $slug );
-    if ( empty( $slug ) )
-        return false;
-    $category = $wpdb->get_var( "SELECT * FROM $wpdb->categories WHERE category_nicename = '$slug' " );
-    return get_category( $category );
-}
-
 // Get the ID of a category from its name
 function get_cat_ID($cat_name='General') {
@@ -345 +329 @@
     return $children;
 }
-
-// Tags
-
-function &get_tags($args = '') {
-    global $wpdb, $category_links;
-
-    $defaults = array('orderby' => 'name', 'order' => 'ASC',
-        'hide_empty' => true, 'exclude' => '', 'include' => '',
-        'number' => '');
-    $args = wp_parse_args( $args, $defaults );
-    if ( 'count' == $args['orderby'] )
-        $args['orderby'] = 'tag_count';
-    else
-        $args['orderby'] = "cat_" . $args['orderby'];  // restricts order by to cat_ID and cat_name fields
-    $args['number'] = (int) $args['number'];
-    extract($args);
-
-    $key = md5( serialize( $args ) );
-    if ( $cache = wp_cache_get( 'get_tags', 'category' ) )
-        if ( isset( $cache[ $key ] ) )
-            return apply_filters('get_tags', $cache[$key], $args);
-
-    $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) . ' ';
-            }
-        }
-    }
-
-    if (!empty($exclusions))
-        $exclusions .= ')';
-    $exclusions = apply_filters('list_tags_exclusions', $exclusions, $args );
-    $where .= $exclusions;
-
-    if ( $hide_empty )
-        $where .= ' AND tag_count > 0';
-
-    $where .= ' AND ( type & ' . TAXONOMY_TAG . ' != 0 ) ';
-
-    if ( !empty($number) )
-        $number = 'LIMIT ' . $number;
-    else
-        $number = '';
-
-    $tags = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE $where ORDER BY $orderby $order $number");
-
-    if ( empty($tags) )
-        return array();
-
-    $cache[ $key ] = $tags;
-    wp_cache_set( 'get_tags', $cache, 'category' );
-
-    $tags = apply_filters('get_tags', $tags, $args);
-    return $tags;
-}
-
 ?>