Changeset 5289

Timestamp:

04/19/07 22:26:52 (1 year 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]

Files:

• branches/2.2/wp-admin/admin-db.php (modified) (5 diffs)
• branches/2.2/wp-admin/admin-functions.php (modified) (4 diffs)
• branches/2.2/wp-admin/categories.php (modified) (1 diff)
• branches/2.2/wp-admin/edit-form-advanced.php (modified) (1 diff)
• branches/2.2/wp-admin/import/utw.php (deleted)
• branches/2.2/wp-admin/import/wp-cat2tag.php (deleted)
• branches/2.2/wp-admin/options-permalink.php (modified) (2 diffs)
• branches/2.2/wp-admin/upgrade-schema.php (modified) (3 diffs)
• branches/2.2/wp-admin/wp-admin.css (modified) (2 diffs)
• branches/2.2/wp-content/themes/classic/index.php (modified) (1 diff)
• branches/2.2/wp-content/themes/default/archive.php (modified) (2 diffs)
• branches/2.2/wp-content/themes/default/index.php (modified) (1 diff)
• branches/2.2/wp-content/themes/default/search.php (modified) (1 diff)
• branches/2.2/wp-content/themes/default/single.php (modified) (1 diff)
• branches/2.2/wp-includes/category-template.php (modified) (2 diffs)
• branches/2.2/wp-includes/category.php (modified) (4 diffs)
• branches/2.2/wp-includes/classes.php (modified) (1 diff)
• branches/2.2/wp-includes/functions.php (modified) (5 diffs)
• branches/2.2/wp-includes/link-template.php (modified) (1 diff)
• branches/2.2/wp-includes/post.php (modified) (7 diffs)
• branches/2.2/wp-includes/query.php (modified) (8 diffs)
• branches/2.2/wp-includes/rewrite.php (modified) (10 diffs)
• branches/2.2/wp-includes/template-loader.php (modified) (1 diff)
• branches/2.2/wp-includes/theme.php (modified) (1 diff)
• branches/2.2/xmlrpc.php (modified) (1 diff)

branches/2.2/wp-admin/admin-db.php

@@ -122 +122 @@
-        $links_private = 0;
-
-    if ( empty($type) )
-        $type = TAXONOMY_CATEGORY;
-
-    // Let's check if we have this category already, if so just do an update
-    if ( !$update && $cat_ID = category_object_exists( $category_nicename ) )
-        $update = true;
-
-    if (!$update) {
-, type) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_private', '$typ
+) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_privat
-        $cat_ID = (int) $wpdb->insert_id;
-    } else {
-, type = '$type'
+
-    }
-
@@ -199 +192 @@
-    $parent = $category->category_parent;
-
-
-
-
-
-
-
-
+
+
+
+
-    // Update children to point to new parent
-    $wpdb->query("UPDATE $wpdb->categories SET category_parent = '$parent' WHERE category_parent = '$cat_ID'");
-
-    // Only set posts and links to the default category if they're not in another category already
- AND rel_type = 'category'
+
-    foreach ( (array) $posts as $post_id ) {
-        $cats = wp_get_post_categories($post_id);
@@ -236 +226 @@
-
-function wp_create_category($cat_name) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -266 +246 @@
-}
-
-object_
+
-    global $wpdb;
-    if (!$category_nicename = sanitize_title($cat_name))
@@ -272 +252 @@
-
-    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
-}
-
-function category_exists($cat_name) {
-    global $wpdb;
-    if (!$category_nicename = sanitize_title($cat_name))
-        return 0;
-
-    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename' AND ( type & " . TAXONOMY_CATEGORY .  " != 0 )");
-}
-
-function tag_exists($tag_name) {
-    global $wpdb;
-    if (! $tag_nicename = sanitize_title($tag_name))
-        return 0;
-
-    return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$tag_nicename' AND ( type & " . TAXONOMY_TAG .  " != 0 )");
-}
-
-function wp_create_tag($tag_name) {
-    if ( $id = tag_exists($tag_name) )
-        return $id;
-    $tag_array = array('cat_name' => $tag_name, 'type' => TAXONOMY_TAG);
-
-    if ( $id = category_object_exists($tag_name) ) {
-        $category = get_category($id);
-        $tag_array['type'] = $category->type | $tag_array['type'];
-        $tag_array['cat_ID'] = $id;
-        $id = wp_update_category($tag_array);
-        return $id;
-    } else {
-        return wp_insert_category($tag_array);
-    }
-}
-

branches/2.2/wp-admin/admin-functions.php

@@ -648 +648 @@
-function return_categories_list( $parent = 0 ) {
-    global $wpdb;
-type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( link_count = 0 OR category_count != 0
+link_count = 0 OR category_count != 0 OR ( link_count = 0 AND category_count = 0 )
-}
-
@@ -658 +658 @@
-}
-
-function get_tags_to_edit( $post_id ) {
-    global $wpdb;
-
-    $post_id = (int) $post_id;
-    if ( !$post_id )
-        return false;
-
-    $tags = $wpdb->get_results( "
-             SELECT category_id, cat_name
-             FROM $wpdb->categories, $wpdb->post2cat
-             WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_id' AND rel_type = 'tag'
-             " );
-    if ( !$tags )
-        return false;
-
-    foreach ( $tags as $tag )
-        $tag_names[] = $tag->cat_name;
-    $tags_to_edit = join( ', ', $tag_names );
-    $tags_to_edit = attribute_escape( $tags_to_edit );
-    $tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
-    return $tags_to_edit;
-}
-
-function get_nested_categories( $default = 0, $parent = 0 ) {
-    global $post_ID, $link_id, $mode, $wpdb;
@@ -688 +665 @@
-             SELECT category_id
-             FROM $wpdb->categories, $wpdb->post2cat
- AND rel_type = 'category'
+
-             " );
-
@@ -745 +722 @@
-function return_link_categories_list( $parent = 0 ) {
-    global $wpdb;
-type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( category_count = 0 OR link_count != 0
+category_count = 0  OR link_count != 0 OR ( link_count = 0 AND category_count = 0 )
-}
-

branches/2.2/wp-admin/categories.php

@@ -119 +119 @@
-
-<?php include('edit-category-form.php'); ?>
-
-<div class="wrap">
-<h3><?php _e('Importers &amp; Converters'); ?></h3>
-
-<ul>
-    <li><a href="admin.php?import=wp-cat2tag"><?php _e('Selectively convert categories to tags'); ?></a></li>
-    <li><a href="admin.php?import=utw"><?php _e('Import Ultimate Tag Warrior tags'); ?></a></li>
-</ul>
-</div>
-<?php endif; ?>
-

branches/2.2/wp-admin/edit-form-advanced.php

@@ -160 +160 @@
-<?php echo $form_prevstatus ?>
-
-<fieldset id="tagdiv">
-    <legend><?php _e('Tags (separate multiple tags with commas: cats, pet food, dogs)'); ?></legend>
-    <div><input type="text" name="tags_input" id="tags-input" size="30" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></div>
-</fieldset>
-
-<p class="submit">

branches/2.2/wp-admin/options-permalink.php

@@ -74 +74 @@
-        $wp_rewrite->set_category_base($category_base);
-    }
-
-    if ( isset($_POST['tag_base']) ) {
-        $tag_base = $_POST['tag_base'];
-        if (! empty($tag_base) )
-            $tag_base = preg_replace('#/+#', '/', '/' . $_POST['tag_base']);
-        $wp_rewrite->set_tag_base($tag_base);
-    }
-}
-
-$permalink_structure = get_option('permalink_structure');
-$category_base = get_option('category_base');
-$tag_base = get_option( 'tag_base' );
-
-if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
@@ -168 +160 @@
-    <p> 
-  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo attribute_escape($category_base); ?>" size="30" /> 
-     </p>
-      <p>
-      <?php _e('Tag base'); ?>: <input name="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /> 
-     </p> 
-    <p class="submit"> 

branches/2.2/wp-admin/upgrade-schema.php

@@ -19 +19 @@
-  category_count bigint(20) NOT NULL default '0',
-  link_count bigint(20) NOT NULL default '0',
-  tag_count bigint(20) NOT NULL default '0',
-  posts_private tinyint(1) NOT NULL default '0',
-  links_private tinyint(1) NOT NULL default '0',
-  type tinyint NOT NULL default '1',
-  PRIMARY KEY  (cat_ID),
-  KEY category_nicename (category_nicename)
@@ -91 +89 @@
-  post_id bigint(20) NOT NULL default '0',
-  category_id bigint(20) NOT NULL default '0',
-  rel_type varchar(64) NOT NULL default 'category',
-  PRIMARY KEY  (rel_id),
-  KEY post_id (post_id,category_id)
@@ -244 +241 @@
-    add_option('show_on_front', 'posts');
-
-    // 2.2
-    add_option('tag_base');
-
-    // Delete unused options
-    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing');

branches/2.2/wp-admin/wp-admin.css

@@ -539 +539 @@
-}
-
-, #tagdiv
+
-    margin: 0 8px 0 0;
-    padding: 0;
@@ -559 +559 @@
-}
-
-, #tagdiv input
+
-    margin: 0;
-    width: 100%;

branches/2.2/wp-content/themes/classic/index.php

@@ -9 +9 @@
-<div class="post" id="post-<?php the_ID(); ?>">
-     <h3 class="storytitle"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-tags(__('Tags: '), ', ', ' &#8212; '); ?> <?php the_
+
-
-    <div class="storycontent">

branches/2.2/wp-content/themes/default/archive.php

@@ -2 +2 @@
-
-    <div id="content" class="narrowcolumn">
-
+
-        <?php if (have_posts()) : ?>
-
-    
-     
+       
+
-        <h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
-
-
+
-      <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
-        <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
-
+
+
-        <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
-
+
+
-        <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
+
-      <?php /* If this is an author archive */ } elseif (is_author()) { ?>
-        <h2 class="pagetitle">Author Archive</h2>
-
+
+
-        <h2 class="pagetitle">Blog Archives</h2>
-
+
+
-
-
@@ -37 +41 @@
-                </div>
-
-<?php the_tags('Tags: ', ', ', '<br />'); ?> 
+
-
-            </div>

branches/2.2/wp-content/themes/default/index.php

@@ -15 +15 @@
-                </div>
-
-<?php the_tags('Tags: ', ', ', '<br />'); ?> 
+
-            </div>
-

branches/2.2/wp-content/themes/default/search.php

@@ -19 +19 @@
-                <small><?php the_time('l, F jS, Y') ?></small>
-
-<?php the_tags('Tags: ', ', ', '<br />'); ?> 
+
-            </div>
-

branches/2.2/wp-content/themes/default/single.php

@@ -17 +17 @@
-
-                <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
-                <?php the_tags( '<p>Tags: ', ', ', '</p>'); ?>
-
-                <p class="postmetadata alt">

branches/2.2/wp-includes/category-template.php

@@ -273 +273 @@
-}
-
-function wp_tag_cloud( $args = '' ) {
-    $defaults = array(
-        'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45, 
-        'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC',
-        'exclude' => '', 'include' => ''
-    );
-    $args = wp_parse_args( $args, $defaults );
-
-    $tags = get_tags( array_merge($args, array('orderby' => 'count', 'order' => 'DESC')) ); // Always query top tags
-
-    if ( empty($tags) )
-        return;
-
-    $return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args
-    echo apply_filters( 'wp_tag_cloud', $return, $args );
-}
-
-// $tags = prefetched tag array ( get_tags() )
-// $args['format'] = 'flat' => whitespace separated, 'list' => UL, 'array' => array()
-// $args['orderby'] = 'name', 'count'
-function wp_generate_tag_cloud( $tags, $args = '' ) {
-    global $wp_rewrite;
-    $defaults = array(
-        'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
-        'format' => 'flat', 'orderby' => 'name', 'order' => 'ASC'
-    );
-    $args = wp_parse_args( $args, $defaults );
-    extract($args);
-
-    if ( !$tags )
-        return;
-    $counts = $tag_links = array();
-    foreach ( (array) $tags as $tag ) {
-        $counts[$tag->cat_name] = $tag->tag_count;
-        $tag_links[$tag->cat_name] = get_tag_link( $tag->cat_ID );
-    }
-
-    $min_count = min($counts);
-    $spread = max($counts) - $min_count;
-    if ( $spread <= 0 )
-        $spread = 1;
-    $font_spread = $largest - $smallest;
-    if ( $font_spread <= 0 )
-        $font_spread = 1;
-    $font_step = $font_spread / $spread;
-
-    // SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-    if ( 'name' == $orderby )
-        uksort($counts, 'strnatcasecmp');
-    else
-        asort($counts);
-
-    if ( 'DESC' == $order )
-        $counts = array_reverse( $tag_counts, true );
-
-    $a = array();
-
-    $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? ' rel="tag"' : '';
-
-    foreach ( $counts as $tag => $count ) {
-        $tag_link = clean_url($tag_links[$tag]);
-        $tag = str_replace(' ', '&nbsp;', wp_specialchars( $tag ));
-        $a[] = "<a href='$tag_link' title='" . attribute_escape( sprintf( __('%d topics'), $count ) ) . "'$rel style='font-size: " .
-            ( $smallest + ( ( $count - $min_count ) * $font_step ) )
-            . "$unit;'>$tag</a>";
-    }
-
-    switch ( $format ) :
-    case 'array' :
-        $return =& $a;
-        break;
-    case 'list' :
-        $return = "<ul class='wp-tag-cloud'>\n\t<li>";
-        $return .= join("</li>\n\t<li>", $a);
-        $return .= "</li>\n</ul>\n";
-        break;
-    default :
-        $return = join("\n", $a);
-        break;
-    endswitch;
-
-    return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
-}
-
-//
-// Helper functions
@@ -373 +289 @@
-}
-
-//
-// Tags
-//
-
-function get_tag_link( $tag_id ) {
-    global $wp_rewrite;
-    $catlink = $wp_rewrite->get_tag_permastruct();
-
-    $category = &get_category($tag_id);
-    $category_nicename = $category->category_nicename;
-
-    if ( empty($catlink) ) {
-        $file = get_option('home') . '/';
-        $catlink = $file . '?tag=' . $category_nicename;
-    } else {
-
-        $catlink = str_replace('%tag%', $category_nicename, $catlink);
-        $catlink = get_option('home') . user_trailingslashit($catlink, 'category');
-    }
-    return apply_filters('tag_link', $catlink, $tag_id);
-}
-
-function get_the_tags( $id = 0 ) {
-    global $post; 
- 
-    $id = (int) $id;
-
-    if ( ! $id && ! in_the_loop() ) 
-        return false; // in-the-loop function 
- 
-    if ( !$id ) 
-        $id = (int) $post->ID;
-
-    $tags = wp_get_post_tags( $id );
-    $tags = apply_filters( 'get_the_tags', $tags );
-    if ( empty( $tags ) ) 
-        return false; 
-    return $tags; 
-}
-
-function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
-    $tags = get_the_tags();
-
-    if ( empty( $tags ) )
-        return false;
-    
-    $tag_list = $before;
-    foreach ( $tags as $tag )
-        $tag_links[] = '<a href="' . get_tag_link($tag->cat_ID) . '">' . $tag->cat_name . '</a>';
-
-    $tag_links = join( $sep, $tag_links );
-    $tag_links = apply_filters( 'the_tags', $tag_links );
-    $tag_list .= $tag_links;
-
-    $tag_list .= $after;
-
-    echo $tag_list;
-}
-
-?>

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';
-
-
-
-
-
+
-
-    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;
-}
-
-?>

branches/2.2/wp-includes/classes.php

@@ -2 +2 @@
-
-class WP {
-tag', '
+
-
-    var $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type');

branches/2.2/wp-includes/functions.php

@@ -603 +603 @@
-
-function clean_post_cache($id) {
-tag_cache, $
+
-
-    if ( isset( $post_cache[$blog_id][$id] ) )
@@ -613 +613 @@
-    if ( isset( $category_cache[$blog_id][$id]) )
-        unset ( $category_cache[$blog_id][$id] );
-
-    if ( isset( $tag_cache[$blog_id][$id]) )
-        unset ( $tag_cache[$blog_id][$id] );
-}
-
@@ -642 +639 @@
-
-function update_post_category_cache($post_ids) {
-tag_cache, $
+
-
-    if ( empty($post_ids) )
@@ -663 +660 @@
-    $post_id_list = join( ',', $post_id_array ); // with already cached stuff removed
-
-, rel_type
+
-
-    if ( empty($dogs) )
-        return;
-
-
-
-
-
-
-
+
+
-}
-
-function update_post_caches(&$posts) {
-, $tag_cache
+
-    global $wpdb, $blog_id;
-
@@ -1476 +1469 @@
-}
-
-function wp_parse_args( $args, $defaults = '' ) {
-    if ( is_array($args) ) :
-        $r =& $args;
-    else :
-        parse_str( $args, $r );
-        if ( get_magic_quotes_gpc() )
-            $r = stripslashes_deep( $r );
-    endif;
-
-    if ( is_array($defaults) ) :
-        extract($defaults);
-        extract($r);
-        return compact(array_keys($defaults)); // only those options defined in $defaults
-    else :
-        return $r;
-    endif;
-}
-
-?>

branches/2.2/wp-includes/link-template.php

@@ -60 +60 @@
-        '%post_id%',
-        '%category%',
-        '%tag%',
-        '%author%',
-        '%pagename%'

branches/2.2/wp-includes/post.php

@@ -459 +459 @@
-}
-
-function wp_get_post_tags( $post_id = 0 ) {
-    global $tag_cache, $blog_id;
-
-    $post_id = (int) $post_id;
-    
-    if ( !isset( $tag_cache[$blog_id][$post_id] ) )
-        update_post_category_cache( $post_id ); // loads $tag_cache
-
-    return $tag_cache[$blog_id][$post_id];
-}
-
-function wp_get_recent_posts($num = 10) {
-    global $wpdb;
@@ -531 +520 @@
-        $comment_status  = apply_filters('comment_status_pre', $comment_status);
-        $ping_status     = apply_filters('ping_status_pre',    $ping_status);
-        $tags_input      = apply_filters('tags_input_pre',     $tags_input);
-    }
-
@@ -666 +654 @@
-    }
-
-
-
+
-
-    if ( 'page' == $post_type ) {
@@ -785 +772 @@
-}
-
-function wp_add_post_tags($post_id = 0, $tags = '') {
-    return wp_set_post_tags($post_id, $tags, true);
-}
-
-function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
-    /* $append - true = don't delete existing tags, just add on, false = replace the tags with the new tags */
-    global $wpdb;
-    
-    $post_id = (int) $post_id;
-    
-    if ( !$post_id )
-        return false;
-    
-    // prevent warnings for unintialized variables
-    $tag_ids = array();
-
-    if ( empty($tags) )
-        $tags = array();
-    $tags = (is_array($tags)) ? $tags : explode( ',', $tags );
-    
-    foreach ( $tags as $tag ) {
-        $tag = trim( $tag );
-        if ( !$tag_slug = sanitize_title( $tag ) )
-            continue; // discard
-        if ( !$tag_id = tag_exists( $tag ) )
-            $tag_id = wp_create_tag( $tag );
-        $tag_ids[] = $tag_id;
-    }
-
-    if ( empty($tag_ids) && ( !empty($tags) || $append ) )
-        return false;
-    
-    $tag_ids = array_unique( $tag_ids );
-    
-    // First the old tags
-    $old_tags = $wpdb->get_col("
-        SELECT category_id
-        FROM $wpdb->post2cat
-        WHERE post_id = '$post_id' AND rel_type = 'tag'");
-    
-    if ( !$old_tags ) {
-        $old_tags = array();
-    } else {
-        $old_tags = array_unique( $old_tags );
-    }
-    
-    // Delete any?
-    $delete_tags = array_diff( $old_tags, $tag_ids);
-    if ( $delete_tags && !$append ) {
-        foreach ( $delete_tags as $del ) {
-            $wpdb->query("
-                DELETE FROM $wpdb->post2cat
-                WHERE category_id = '$del'
-                    AND post_id = '$post_id'
-                    AND rel_type = 'tag'
-                ");
-        }
-    }
-    
-    // Add any?
-    $add_tags = array_diff( $tag_ids, $old_tags );
-    if ( $add_tags ) {
-        foreach ( $add_tags as $new_tag ) {
-            $new_tag = (int) $new_tag;
-            if ( !empty($new_tag) )
-                $wpdb->query("
-                    INSERT INTO $wpdb->post2cat (post_id, category_id, rel_type) 
-                    VALUES ('$post_id', '$new_tag', 'tag')");
-        }
-    }
-    
-    // Update category counts.
-    $all_affected_tags = array_unique( array_merge( $tag_ids, $old_tags ) );
-    foreach ( $all_affected_tags as $tag_id ) {
-        $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$tag_id' AND rel_type = 'tag'" );
-        $wpdb->query( "UPDATE $wpdb->categories SET tag_count = '$count', type = type | " . TAXONOMY_TAG . " WHERE cat_ID = '$tag_id'" );
-        if ( $count == 0 )
-            $wpdb->query( "UPDATE $wpdb->categories SET type = type & ~". TAXONOMY_TAG . " WHERE cat_ID = '$tag_id'" );
-        clean_category_cache( $tag_id );
-        do_action( 'edit_category', $tag_id );
-        do_action( 'edit_tag', $tag_id );
-    }
-}
-
-function wp_set_post_categories($post_ID = 0, $post_categories = array()) {
-    global $wpdb;
@@ -883 +786 @@
-        SELECT category_id
-        FROM $wpdb->post2cat
- AND rel_type = 'category'
+
-
-    if (!$old_categories) {
@@ -899 +802 @@
-                DELETE FROM $wpdb->post2cat
-                WHERE category_id = '$del'
- AND rel_type = 'category'
+
-                ");
-        }
@@ -920 +823 @@
-    $all_affected_