WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow muliple tag-like taxonomies in the post editor. see #6387 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-12-18 19:12:26 +00:00
parent b4654848fc
commit 8a8ac376bf
15 changed files with 265 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/admin-ajax.php
View File

@ -45,6 +45,11 @@ case 'ajax-tag-search' :
$s = $_GET['q']; // is this slashed already?
if ( isset($_GET['tax']) )
$taxonomy = sanitize_title($_GET['tax']);
else
die('0');
if ( false !== strpos( $s, ',' ) ) {
$s = explode( ',', $s );
$s = $s[count( $s ) - 1];
@ -52,7 +57,9 @@ case 'ajax-tag-search' :
$s = trim( $s );
if ( strlen( $s ) < 2 )
die; // require 2 chars for matching
$results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = 'post_tag' AND t.name LIKE ('%". $s . "%')" );
$results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = '$taxonomy' AND t.name LIKE ('%" . $s . "%')" );
echo join( $results, "\n" );
die;
break;
@ -490,7 +497,12 @@ case 'get-tagcloud' :
if ( !current_user_can( 'manage_categories' ) )
die('-1');
$tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
if ( isset($_POST['tax']) )
$taxonomy = sanitize_title($_POST['tax']);
else
die('0');
$tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
if ( empty( $tags ) )
die( __('No tags found!') );
@ -776,7 +788,6 @@ case 'autosave' : // The name of this action is hardcoded in edit_post()
global $current_user;
$_POST['post_category'] = explode(",", $_POST['catslist']);
$_POST['tags_input'] = explode(",", $_POST['tags_input']);
if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
unset($_POST['post_category']);

6
wp-admin/css/colors-classic.css
View File

@ -682,12 +682,12 @@ li.widget-list-control-item h4,
color: #448abd;
}
#tagchecklist span a,
.tagchecklist span a,
#bulk-titles div a {
background: url(../images/xit.gif) no-repeat;
}
#tagchecklist span a:hover,
.tagchecklist span a:hover,
#bulk-titles div a:hover {
background: url(../images/xit.gif) no-repeat -10px 0;
}
@ -1007,7 +1007,7 @@ abbr.required,
#timestampdiv input,
#namediv input,
#tagsdiv #the-tagcloud {
#poststuff .inside .the-tagcloud {
border-color: #ddd;
}

6
wp-admin/css/colors-fresh.css
View File

@ -682,12 +682,12 @@ li.widget-list-control-item h4,
color: #448abd;
}
#tagchecklist span a,
.tagchecklist span a,
#bulk-titles div a {
background: url(../images/xit.gif) no-repeat;
}
#tagchecklist span a:hover,
.tagchecklist span a:hover,
#bulk-titles div a:hover {
background: url(../images/xit.gif) no-repeat -10px 0;
}
@ -1007,7 +1007,7 @@ abbr.required,
#timestampdiv input,
#namediv input,
#tagsdiv #the-tagcloud {
#poststuff .inside .the-tagcloud {
border-color: #ddd;
}

2
wp-admin/css/ie-rtl.css
View File

@ -44,7 +44,7 @@ div#dashboard-widgets {
padding-right: 0;
padding-left: 1px;
}
#tagchecklist span a {
.tagchecklist span a {
margin: 4px -9px 0 0;
}
.widefat th input {

6
wp-admin/css/ie.css
View File

@ -245,7 +245,7 @@ li.widget-list-control-item,
li.widget-list-control-item h4,
.widget-sortable,
.widget-control-actions,
#tagchecklist,
.tagchecklist,
#col-container,
#col-left,
#col-right {
@ -296,12 +296,12 @@ div#dashboard-widgets {
padding-right: 1px;
}
#tagchecklist span, #tagchecklist span a {
.tagchecklist span, .tagchecklist span a {
display: inline-block;
display: block;
}
#tagchecklist span a {
.tagchecklist span a {
margin: 4px 0 0 -9px;
}

36
wp-admin/edit-form-advanced.php
View File

@ -263,14 +263,40 @@ add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side',
*
* @param object $post
*/
function post_tags_meta_box($post) {
function post_tags_meta_box($post, $box) {
$tax_name = substr($box['id'], 8);
$taxonomy = get_taxonomy($tax_name);
if ( isset($taxonomy->helps) )
$helps = attribute_escape($taxonomy->helps);
else
$helps = '';
?>
<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
<div id="tagchecklist"></div>
<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p>
<div class="tagsdiv" id="<?php echo $tax_name; ?>">
<p class="jaxtag">
<label class="hidden" for="newtag"><?php _e( $box['title'] ); ?></label>
<input type="hidden" name="<?php echo "tax_input[$tax_name]"; ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]" value="<?php echo get_terms_to_edit( $post->ID, $tax_name ); ?>" />
<span class="ajaxtag" style="display:none;">
<input type="text" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="<?php _e('Add new tag'); ?>" />
<input type="button" class="button tagadd" value="<?php _e('Add'); ?>" tabindex="3" />
</span>
<?php echo $helps ? "<div class='howto'>$helps</div>" : ''; ?>
</p>
<div class="tagchecklist"></div>
</div>
<p class="tagcloud-link hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( __('Choose from the most used tags in %s'), $box['title'] ); ?></a></p>
<?php
}
add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
// all tag-style post taxonomies
foreach ( get_object_taxonomies('post') as $tax_name ) {
if ( !is_taxonomy_hierarchical($tax_name) ) {
$taxonomy = get_taxonomy($tax_name);
$label = isset($taxonomy->label) ? attribute_escape($taxonomy->label) : $tax_name;
add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', 'post', 'side', 'core');
}
}
/**
* Display post categories form fields.

42
wp-admin/includes/taxonomy.php
View File

@ -194,21 +194,37 @@ function wp_update_category($catarr) {
* @param unknown_type $post_id
* @return unknown
*/
function get_tags_to_edit( $post_id ) {
function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
return get_terms_to_edit( $post_id, $taxonomy);
}
/**
* {@internal Missing Short Description}}
*
* @since unknown
*
* @param unknown_type $post_id
* @return unknown
*/
function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
$post_id = (int) $post_id;
if ( !$post_id )
return false;
$tags = wp_get_post_tags($post_id);
$tags = wp_get_post_terms($post_id, $taxonomy, array());
if ( !$tags )
return false;
if ( is_wp_error($tags) )
return $tags;
foreach ( $tags as $tag )
$tag_names[] = $tag->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 );
$tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
return $tags_to_edit;
}
@ -233,10 +249,20 @@ function tag_exists($tag_name) {
* @return unknown
*/
function wp_create_tag($tag_name) {
if ( $id = tag_exists($tag_name) )
return $id;
return wp_insert_term($tag_name, 'post_tag');
return wp_create_term( $tag_name, 'post_tag');
}
?>
/**
* {@internal Missing Short Description}}
*
* @since unknown
*
* @param unknown_type $tag_name
* @return unknown
*/
function wp_create_term($tag_name, $taxonomy = 'post_tag') {
if ( $id = is_term($tag_name, $taxonomy) )
return $id;
return wp_insert_term($tag_name, $taxonomy);
}

5
wp-admin/includes/template.php
View File

@ -2695,7 +2695,7 @@ function wp_remember_old_slug() {
* @param string $context The context within the page where the boxes should show ('normal', 'advanced').
* @param string $priority The priority within the context where the boxes should show ('high', 'low').
*/
function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $priority = 'default') {
function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $priority = 'default', $callback_args=null) {
global $wp_meta_boxes;
if ( !isset($wp_meta_boxes) )
@ -2729,6 +2729,7 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri
} elseif ( 'sorted' == $priority ) {
$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
}
// An id can be in only one priority and one context
if ( $priority != $a_priority || $context != $a_context )
@ -2742,7 +2743,7 @@ function add_meta_box($id, $title, $callback, $page, $context = 'advanced', $pri
if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
$wp_meta_boxes[$page][$context][$priority] = array();
$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
}
/**

166
wp-admin/js/post.js
View File

@ -1,95 +1,146 @@
// this file contains all the scripts used in the post/edit page
// return an array with any duplicate, whitespace or values removed
function array_unique_noempty(a) {
var out = [];
jQuery.each( a, function(key, val) {
val = jQuery.trim(val);
if ( val && jQuery.inArray(val, out) == -1 )
out.push(val);
} );
return out;
}
function new_tag_remove_tag() {
var id = jQuery( this ).attr( 'id' );
var num = id.substr( 10 );
var current_tags = jQuery( '#tags-input' ).val().split(',');
var num = id.split('-check-num-')[1];
var taxbox = jQuery(this).parents('.tagsdiv');
var current_tags = taxbox.find( '.the-tags' ).val().split(',');
delete current_tags[num];
var new_tags = [];
jQuery.each( current_tags, function( key, val ) {
if ( val && !val.match(/^\s+$/) && '' != val ) {
new_tags = new_tags.concat( val );
jQuery.each( current_tags, function(key, val) {
val = jQuery.trim(val);
if ( val ) {
new_tags.push(val);
}
});
jQuery( '#tags-input' ).val( new_tags.join( ',' ).replace( /\s*,+\s*/, ',' ).replace( /,+/, ',' ).replace( /,+\s+,+/, ',' ).replace( /,+\s*$/, '' ).replace( /^\s*,+/, '' ) );
tag_update_quickclicks();
jQuery('#newtag').focus();
taxbox.find('.the-tags').val( new_tags.join(',').replace(/\s*,+\s*/, ',').replace(/,+/, ',').replace(/,+\s+,+/, ',').replace(/,+\s*$/, '').replace(/^\s*,+/, '') );
tag_update_quickclicks(taxbox);
return false;
}
function tag_update_quickclicks() {
if ( jQuery( '#tags-input' ).length == 0 )
function tag_update_quickclicks(taxbox) {
if ( jQuery(taxbox).find('.the-tags').length == 0 )
return;
var current_tags = jQuery( '#tags-input' ).val().split(',');
jQuery( '#tagchecklist' ).empty();
var current_tags = jQuery(taxbox).find('.the-tags').val().split(',');
jQuery(taxbox).find('.tagchecklist').empty();
shown = false;
// jQuery.merge( current_tags, current_tags ); // this doesn't work anymore, need something to array_unique
jQuery.each( current_tags, function( key, val ) {
val = val.replace( /^\s+/, '' ).replace( /\s+$/, '' ); // trim
val = jQuery.trim(val);
if ( !val.match(/^\s+$/) && '' != val ) {
txt = '<span><a id="tag-check-' + key + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
jQuery( '#tagchecklist' ).append( txt );
jQuery( '#tag-check-' + key ).click( new_tag_remove_tag );
shown = true;
var button_id = jQuery(taxbox).attr('id') + '-check-num-' + key;
txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
jQuery(taxbox).find('.tagchecklist').append(txt);
jQuery( '#' + button_id ).click( new_tag_remove_tag );
}
});
if ( shown )
jQuery( '#tagchecklist' ).prepend( '<strong>'+postL10n.tagsUsed+'</strong><br />' );
jQuery(taxbox).find('.tagchecklist').prepend('<strong>'+postL10n.tagsUsed+'</strong><br />');
}
function tag_flush_to_text(e,a) {
function tag_flush_to_text(id, a) {
a = a || false;
var text = a ? jQuery(a).text() : jQuery('#newtag').val();
var newtags = jQuery('#tags-input').val();
var taxbox = jQuery('#'+id);
var text = a ? jQuery(a).text() : taxbox.find('input.newtag').val();
var t = text.replace( /\s*([^,]+).*/, '$1,' );
newtags += ','
if ( newtags.indexOf(t) != -1 )
// is the input box empty (i.e. showing the 'Add new tag' tip)?
if ( taxbox.find('input.newtag').hasClass('form-input-tip') && ! a )
return false;
newtags += text;
var tags = taxbox.find('.the-tags').val();
var newtags = tags ? tags + ',' + text : text;
// massage
newtags = newtags.replace( /\s+,+\s*/g, ',' ).replace( /,+/g, ',' ).replace( /,+\s+,+/g, ',' ).replace( /,+\s*$/g, '' ).replace( /^\s*,+/g, '' );
jQuery('#tags-input').val( newtags );
tag_update_quickclicks();
if ( ! a ) {
jQuery('#newtag').val('');
jQuery('#newtag').focus();
}
newtags = newtags.replace(/\s+,+\s*/g, ',').replace(/,+/g, ',').replace(/,+\s+,+/g, ',').replace(/,+\s*$/g, '').replace(/^\s*,+/g, '');
newtags = array_unique_noempty(newtags.split(',')).join(',');
taxbox.find('.the-tags').val(newtags);
tag_update_quickclicks(taxbox);
if ( ! a )
taxbox.find('input.newtag').val('').focus();
return false;
}
function tag_save_on_publish() {
if ( jQuery('#newtag').val() != postL10n.addTag )
tag_flush_to_text();
jQuery('.tagsdiv').each( function(i) {
if ( !jQuery(this).find('input.newtag').hasClass('form-input-tip') )
tag_flush_to_text(jQuery(this).parents('.tagsdiv').attr('id'));
} );
}
function tag_press_key( e ) {
if ( 13 == e.keyCode ) {
tag_flush_to_text();
if ( 13 == e.which ) {
tag_flush_to_text(jQuery(e.target).parents('.tagsdiv').attr('id'));
return false;
}
};
function tag_init() {
jQuery('.ajaxtag').show();
jQuery('.tagsdiv').each( function(i) {
tag_update_quickclicks(this);
} );
// add the quickadd form
jQuery('.ajaxtag input.tagadd').click(function(){tag_flush_to_text(jQuery(this).parents('.tagsdiv').attr('id'));});
jQuery('.ajaxtag input.newtag').focus(function() {
if ( this.value == postL10n.addTag ) {
jQuery(this).val( '' ).removeClass( 'form-input-tip' );
}
});
jQuery('.ajaxtag input.newtag').blur(function() {
if ( this.value == '' ) {
jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
}
});
// auto-save tags on post save/publish
jQuery('#publish').click( tag_save_on_publish );
jQuery('#save-post').click( tag_save_on_publish );
// catch the enter key
jQuery('.ajaxtag input.newtag').keypress( tag_press_key );
}
(function($){
tagCloud = {
init : function() {
$('#tagcloud-link').click(function(){tagCloud.get(); $(this).unbind().click(function(){return false;}); return false;});
$('.tagcloud-link').click(function(){tagCloud.get($(this).attr('id')); $(this).unbind().click(function(){return false;}); return false;});
},
get : function() {
$.post('admin-ajax.php', {'action':'get-tagcloud'}, function(r, stat) {
get : function(id) {
tax = id.substr(id.indexOf('-')+1);
$.post('admin-ajax.php', {'action':'get-tagcloud','tax':tax}, function(r, stat) {
if ( 0 == r || 'success' != stat )
r = wpAjax.broken;
r = '<p id="the-tagcloud">'+r+'</p>';
$('#tagcloud-link').after($(r));
$('#the-tagcloud a').click(function(){
tag_flush_to_text(0,this);
r = $('<p id="tagcloud-'+tax+'" class="the-tagcloud">'+r+'</p>');
$('a', r).click(function(){
var id = $(this).parents('p').attr('id');
tag_flush_to_text(id.substr(id.indexOf('-')+1), this);
return false;
});
$('#'+id).after(r);
});
}
}
@ -107,29 +158,16 @@ jQuery(document).ready( function($) {
// Editable slugs
make_slugedit_clickable();
jQuery('#tags-input').hide();
tag_update_quickclicks();
// add the quickadd form
jQuery('#jaxtag').prepend('<span id="ajaxtag"><input type="text" name="newtag" id="newtag" class="form-input-tip" size="16" autocomplete="off" value="'+postL10n.addTag+'" /><input type="button" class="button" id="tagadd" value="' + postL10n.add + '" tabindex="3" /><input type="hidden"/><input type="hidden"/><span class="howto">'+postL10n.separate+'</span></span>');
jQuery('#tagadd').click( tag_flush_to_text );
jQuery('#newtag').focus(function() {
if ( this.value == postL10n.addTag )
jQuery(this).val( '' ).removeClass( 'form-input-tip' );
});
jQuery('#newtag').blur(function() {
if ( this.value == '' )
jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
});
// auto-save tags on post save/publish
jQuery('#publish').click( tag_save_on_publish );
jQuery('#save-post').click( tag_save_on_publish );
// prepare the tag UI
tag_init();
jQuery('#title').blur( function() { if ( (jQuery("#post_ID").val() > 0) || (jQuery("#title").val().length == 0) ) return; autosave(); } );
// auto-suggest stuff
jQuery('#newtag').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
jQuery('#newtag').keypress( tag_press_key );
jQuery('.newtag').each(function(){
var tax = $(this).parents('div.tagsdiv').attr('id');
$(this).suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
});
// category tabs
var categoryTabs =jQuery('#category-tabs').tabs();

10
wp-admin/rtl.css
View File

@ -211,7 +211,7 @@ td.available-theme {
#normal-sortables .postbox .submit {
float: left;
}
#post-body #tagsdiv #newtag {
#post-body .tagsdiv #newtag {
margin-right: 0;
margin-left: 5px;
}
@ -221,18 +221,18 @@ td.available-theme {
#comment-status-radio input {
margin: 2px 0 5px 3px;
}
#tagchecklist {
.tagchecklist {
margin-left: 0;
margin-right: 10px;
}
#tagchecklist strong {
.tagchecklist strong {
margin-left: 0;
margin-right: -8px;
}
#tagchecklist span {
.tagchecklist span {
float: right;
}
#tagchecklist span a {
.tagchecklist span a {
margin: 6px -9px 0 0;
float: right;
}

16
wp-admin/wp-admin.css
View File

@ -1355,7 +1355,7 @@ table.form-table td .updated {
display: none;
}
#post-body #tagsdiv #newtag {
#post-body .tagsdiv #newtag {
margin-right: 5px;
width: 16em;
}
@ -1364,7 +1364,7 @@ table.form-table td .updated {
width: 94%
}
#side-info-column #tagsdiv #newtag {
#side-info-column .tagsdiv #newtag {
width: 68%;
}
@ -1421,18 +1421,18 @@ table.form-table td .updated {
padding: 5px 0;
}
#tagchecklist {
.tagchecklist {
margin-left: 10px;
font-size: 12px;
overflow: auto;
}
#tagchecklist strong {
.tagchecklist strong {
margin-left: -8px;
position: absolute;
}
#tagchecklist span {
.tagchecklist span {
margin-right: 25px;
display: block;
float: left;
@ -1442,7 +1442,7 @@ table.form-table td .updated {
cursor: default;
}
#tagchecklist span a {
.tagchecklist span a {
margin: 6px 0pt 0pt -9px;
cursor: pointer;
width: 10px;
@ -2830,8 +2830,8 @@ form.upgrade {
margin-top: 8px;
}
#tagsdiv #the-tagcloud {
margin: 5px 5px 10px;
#poststuff .inside .the-tagcloud {
margin: 5px 0 10px;
padding: 8px;
border-width: 1px;
border-style: solid;

6
wp-includes/js/autosave.js
View File

@ -130,11 +130,15 @@ var autosave = function() {
post_ID: jQuery("#post_ID").val() || 0,
post_title: jQuery("#title").val() || "",
autosavenonce: jQuery('#autosavenonce').val(),
tags_input: jQuery("#tags-input").val() || "",
//tags_input: jQuery("#tags-input").val() || "",
post_type: jQuery('#post_type').val() || "",
autosave: 1
};
jQuery('.tags-input').each( function() {
post_data[this.name] = this.value;
} );
// We always send the ajax request in order to keep the post lock fresh.
// This (bool) tells whether or not to write the post to the DB during the ajax request.
var doAutoSave = true;

51
wp-includes/post.php
View File

@ -1206,12 +1206,34 @@ function wp_get_post_categories( $post_id = 0, $args = array() ) {
* @return array List of post tags.
*/
function wp_get_post_tags( $post_id = 0, $args = array() ) {
return wp_get_post_terms( $post_id, 'post_tag', $args);
}
/**
* Retrieve the terms for a post.
*
* There is only one default for this function, called 'fields' and by default
* is set to 'all'. There are other defaults that can be override in
* {@link wp_get_object_terms()}.
*
* @package WordPress
* @subpackage Post
* @since 2.8.0
*
* @uses wp_get_object_terms() Gets the tags for returning. Args can be found here
*
* @param int $post_id Optional. The Post ID
* @param string $taxonomy The taxonomy for which to retrieve terms. Defaults to post_tag.
* @param array $args Optional. Overwrite the defaults
* @return array List of post tags.
*/
function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
$post_id = (int) $post_id;
$defaults = array('fields' => 'all');
$args = wp_parse_args( $args, $defaults );
$tags = wp_get_object_terms($post_id, 'post_tag', $args);
$tags = wp_get_object_terms($post_id, $taxonomy, $args);
return $tags;
}
@ -1498,7 +1520,15 @@ function wp_insert_post($postarr = array(), $wp_error = false) {
}
wp_set_post_categories( $post_ID, $post_category );
// old-style tags_input
if ( !empty($tags_input) )
wp_set_post_tags( $post_ID, $tags_input );
// new-style support for all tag-like taxonomies
if ( !empty($tax_input) ) {
foreach ( $tax_input as $taxonomy => $tags ) {
wp_set_post_terms( $post_ID, $tags, $taxonomy );
}
}
$current_guid = get_post_field( 'guid', $post_ID );
@ -1685,7 +1715,21 @@ function wp_add_post_tags($post_id = 0, $tags = '') {
* @return bool|null Will return false if $post_id is not an integer or is 0. Will return null otherwise
*/
function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
return wp_set_post_terms( $post_id, $tags, 'post_tag', $append);
}
/**
* Set the terms for a post.
*
* @since 2.8.0
* @uses wp_set_object_terms() Sets the tags for the post.
*
* @param int $post_id Post ID.
* @param string $tags The tags to set for the post, separated by commas.
* @param bool $append If true, don't delete existing tags, just add on. If false, replace the tags with the new tags.
* @return bool|null Will return false if $post_id is not an integer or is 0. Will return null otherwise
*/
function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
$post_id = (int) $post_id;
if ( !$post_id )
@ -1693,8 +1737,9 @@ function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
if ( empty($tags) )
$tags = array();
$tags = (is_array($tags)) ? $tags : explode( ',', trim($tags, " \n\t\r\0\x0B,") );
wp_set_object_terms($post_id, $tags, 'post_tag', $append);
$tags = is_array($tags) ? $tags : explode( ',', trim($tags, " \n\t\r\0\x0B,") );
wp_set_object_terms($post_id, $tags, $taxonomy, $append);
}
/**

4
wp-includes/script-loader.php
View File

@ -77,7 +77,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};'
) );
$scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20081210' );
$scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20081217' );
$scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20081210' );
$scripts->localize( 'wp-lists', 'wpListL10n', array(
@ -179,7 +179,7 @@ function wp_default_scripts( &$scripts ) {
'cancel' => __('Cancel'),
'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};'
) );
$scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081210' );
$scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081217' );
$scripts->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'),
'add' => attribute_escape(__('Add')),

4
wp-includes/taxonomy.php
View File

@ -17,8 +17,8 @@
* @global array $wp_taxonomies
*/
$wp_taxonomies = array();
$wp_taxonomies['category'] = (object) array('name' => 'category', 'object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count');
$wp_taxonomies['post_tag'] = (object) array('name' => 'post_tag', 'object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count');
$wp_taxonomies['category'] = (object) array('name' => 'category', 'object_type' => 'post', 'hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'));
$wp_taxonomies['post_tag'] = (object) array('name' => 'post_tag', 'object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'));
$wp_taxonomies['link_category'] = (object) array('name' => 'link_category', 'object_type' => 'link', 'hierarchical' => false);
/**