<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16535] trunk: Revert [15688], [15689], [15691].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16535">16535</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-22 17:17:26 +0000 (Mon, 22 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/15688">[15688]</a>, <a href="http://trac.wordpress.org/changeset/15689">[15689]</a>, <a href="http://trac.wordpress.org/changeset/15691">[15691]</a>. Try again in 3.2. see <a href="http://trac.wordpress.org/ticket/14966">#14966</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestaxonomyphp">trunk/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-admin/includes/media.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -353,7 +353,56 @@
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><ins>+ */
+function media_buttons() {
+ $do_image = $do_audio = $do_video = true;
+ if ( is_multisite() ) {
+ $media_buttons = get_site_option( 'mu_media_buttons' );
+ if ( empty($media_buttons['image']) )
+ $do_image = false;
+ if ( empty($media_buttons['audio']) )
+ $do_audio = false;
+ if ( empty($media_buttons['video']) )
+ $do_video = false;
+ }
+ $out = '';
+
+ if ( $do_image )
+ $out .= _media_button(__('Add an Image'), 'images/media-button-image.gif?ver=20100531', 'image');
+ if ( $do_video )
+ $out .= _media_button(__('Add Video'), 'images/media-button-video.gif?ver=20100531', 'video');
+ if ( $do_audio )
+ $out .= _media_button(__('Add Audio'), 'images/media-button-music.gif?ver=20100531', 'audio');
+
+ $out .= _media_button(__('Add Media'), 'images/media-button-other.gif?ver=20100531', 'media');
+
+ $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
+
+ printf($context, $out);
+}
+add_action( 'media_buttons', 'media_buttons' );
+
+function _media_button($title, $icon, $type) {
+ return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
+}
+
+function get_upload_iframe_src($type) {
+ global $post_ID, $temp_ID;
+ $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
+ $upload_iframe_src = add_query_arg('post_id', $uploading_iframe_ID, 'media-upload.php');
+
+ if ( 'media' != $type )
+ $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+ $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
+
+ return add_query_arg('TB_iframe', true, $upload_iframe_src);
+}
+
+/**
+ * {@internal Missing Short Description}}
</ins><span class="cx"> *
</span><ins>+ * @since unknown
+ *
</ins><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function media_upload_form_handler() {
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-admin/includes/post.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -361,8 +361,63 @@
</span><span class="cx"> return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Default post information to use when populating the "Write Post" form.
+ *
+ * @since unknown
+ *
+ * @param string $post_type A post type string, defaults to 'post'.
+ * @return object stdClass object containing all the default post data as attributes
+ */
+function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
+ global $wpdb;
</ins><span class="cx">
</span><ins>+ $post_title = '';
+ if ( !empty( $_REQUEST['post_title'] ) )
+ $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
</ins><span class="cx">
</span><ins>+ $post_content = '';
+ if ( !empty( $_REQUEST['content'] ) )
+ $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
+
+ $post_excerpt = '';
+ if ( !empty( $_REQUEST['excerpt'] ) )
+ $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
+
+ if ( $create_in_db ) {
+ // Cleanup old auto-drafts more than 7 days old
+ $old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
+ foreach ( (array) $old_posts as $delete )
+ wp_delete_post( $delete, true ); // Force delete
+ $post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
+ $post = get_post( $post_id );
+ } else {
+ $post->ID = 0;
+ $post->post_author = '';
+ $post->post_date = '';
+ $post->post_date_gmt = '';
+ $post->post_password = '';
+ $post->post_type = $post_type;
+ $post->post_status = 'draft';
+ $post->to_ping = '';
+ $post->pinged = '';
+ $post->comment_status = get_option( 'default_comment_status' );
+ $post->ping_status = get_option( 'default_ping_status' );
+ $post->post_pingback = get_option( 'default_pingback_flag' );
+ $post->post_category = get_option( 'default_category' );
+ $post->page_template = 'default';
+ $post->post_parent = 0;
+ $post->menu_order = 0;
+ }
+
+ $post->post_content = apply_filters( 'default_content', $post_content, $post );
+ $post->post_title = apply_filters( 'default_title', $post_title, $post );
+ $post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
+ $post->post_name = '';
+
+ return $post;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Get the default page information to use.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/taxonomy.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/taxonomy.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-admin/includes/taxonomy.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -199,6 +199,48 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><ins>+ * @param unknown_type $post_id
+ * @return unknown
+ */
+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_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 = esc_attr( $tags_to_edit );
+ $tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
+
+ return $tags_to_edit;
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
</ins><span class="cx"> * @param unknown_type $tag_name
</span><span class="cx"> * @return unknown
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-includes/media.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -1396,77 +1396,4 @@
</span><span class="cx"> require_once( ABSPATH . WPINC . '/class-oembed.php' );
</span><span class="cx"> $oembed = _wp_oembed_get_object();
</span><span class="cx"> $oembed->providers[$format] = array( $provider, $regex );
</span><del>-}
-
-/**
- * Generate HTML for the editor media buttons (image, video, audio).
- *
- * @since 3.1.0
- *
- * @return string HTML
- */
-function get_media_buttons() {
- $do_image = $do_audio = $do_video = true;
- if ( is_multisite() ) {
- $media_buttons = get_site_option( 'mu_media_buttons' );
- if ( empty( $media_buttons['image'] ) )
- $do_image = false;
- if ( empty( $media_buttons['audio'] ) )
- $do_audio = false;
- if ( empty( $media_buttons['video'] ) )
- $do_video = false;
- }
- $out = '';
-
- if ( $do_image )
- $out .= _media_button( __( 'Add an Image' ), 'images/media-button-image.gif?ver=20100531', 'image' );
- if ( $do_video )
- $out .= _media_button( __( 'Add Video' ), 'images/media-button-video.gif?ver=20100531', 'video' );
- if ( $do_audio )
- $out .= _media_button( __( 'Add Audio' ), 'images/media-button-music.gif?ver=20100531', 'audio' );
-
- $out .= _media_button( __( 'Add Media' ), 'images/media-button-other.gif?ver=20100531', 'media' );
-
- $context = apply_filters( 'media_buttons_context', __( 'Upload/Insert: %s' ) );
-
- return sprintf($context, $out);
-
-
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function media_buttons() {
- echo get_media_buttons();
-}
-add_action( 'media_buttons', 'media_buttons' );
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- * @access private
- */
-function _media_button( $title, $icon, $type ) {
- return "<a href='" . esc_url( get_upload_iframe_src( $type ) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function get_upload_iframe_src( $type ) {
- global $post_ID, $temp_ID;
- $uploading_iframe_ID = (int) ( 0 == $post_ID ? $temp_ID : $post_ID );
- $upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, 'media-upload.php' );
-
- if ( 'media' != $type )
- $upload_iframe_src = add_query_arg( 'type', $type, $upload_iframe_src );
- $upload_iframe_src = apply_filters( $type . '_upload_iframe_src', $upload_iframe_src );
-
- return add_query_arg( 'TB_iframe', true, $upload_iframe_src );
-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-includes/post.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -2317,7 +2317,7 @@
</span><span class="cx">
</span><span class="cx"> $post = get_post($postid, $mode);
</span><span class="cx">
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> ( OBJECT == $mode && empty( $post->ID ) ) ||
</span><span class="cx"> ( OBJECT != $mode && empty( $post['ID'] ) )
</span><span class="cx"> )
</span><span class="lines">@@ -5038,206 +5038,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Default post information to use when populating the "Write Post" form.
- *
- * @since 2.0.0
- *
- * @param string $post_type A post type string, defaults to 'post'.
- * @param bool $create_in_db If true then also insert an auto-draft into database
- * @return object stdClass object containing all the default post data as attributes
- */
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
- global $wpdb;
-
- $post_title = '';
- if ( !empty( $_REQUEST['post_title'] ) )
- $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
-
- $post_content = '';
- if ( !empty( $_REQUEST['content'] ) )
- $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
-
- $post_excerpt = '';
- if ( !empty( $_REQUEST['excerpt'] ) )
- $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
-
- if ( $create_in_db ) {
- // Cleanup old auto-drafts more than 7 days old
- $old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
- foreach ( (array) $old_posts as $delete )
- wp_delete_post( $delete, true ); // Force delete
- $post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
- $post = get_post( $post_id );
- } else {
- $post->ID = 0;
- $post->post_author = '';
- $post->post_date = '';
- $post->post_date_gmt = '';
- $post->post_password = '';
- $post->post_type = $post_type;
- $post->post_status = 'draft';
- $post->to_ping = '';
- $post->pinged = '';
- $post->comment_status = get_option( 'default_comment_status' );
- $post->ping_status = get_option( 'default_ping_status' );
- $post->post_pingback = get_option( 'default_pingback_flag' );
- $post->post_category = get_option( 'default_category' );
- $post->page_template = 'default';
- $post->post_parent = 0;
- $post->menu_order = 0;
- }
-
- $post->post_content = apply_filters( 'default_content', $post_content, $post );
- $post->post_title = apply_filters( 'default_title', $post_title, $post );
- $post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
- $post->post_name = '';
-
- return $post;
-}
-
-/**
- * Returns or echos a form containing a post box.
- *
- * Used for the QuickPress dashboard module.
- *
- * @since 3.1.0
- *
- * @param array $args Arguments.
- * @param string $post_type Post type.
- */
-function wp_quickpress_form( $args = array(), $post_type = 'post'){
- global $post_ID;
-
- $fields = array(
- 'title' => array(
- 'capability' => '', // Capability to check before outputing field
- 'output' => '<h4 id="%s-title"><label for="title">'. __('Title') .'</label></h4>
- <div class="input-text-wrap">
- <input type="text" name="post_title" id="%s-title" tabindex="%d" autocomplete="off" value="'. esc_attr( $post->post_title ).'" />
- </div>'
- ),
- 'media_buttons' => array(
- 'capability' => 'upload_files',
- 'output' => '<div id="%s-media-buttons" class="hide-if-no-js">'. get_media_buttons() .'</div>',
- ),
- 'content' => array(
- 'capability' => '',
- 'output' => '<h4 id="%s-content-label"><label for="content">'. __('Content') .'</label></h4>
- <div class="textarea-wrap">
- <textarea name="content" id="%s-content" class="mceEditor" rows="3" cols="15" tabindex="%d">'. esc_textarea( $post->post_content ) .'</textarea>
- </div>
- '." <script type='text/javascript'>edCanvas = document.getElementById('content');edInsertContent = null;</script>
- "
-
- ),
- 'tags' => array(
- 'capability' =>'',
- 'output' => '
- <h4><label for="%s-tags-input">'. __('Tags') .'</label></h4>
- <div class="input-text-wrap">
- <input type="text" name="%s-tags_input" id="tags-input" tabindex="%d" value="'. get_tags_to_edit( $post->ID ) .'" />
- </div>
-'
- ),
-
- );
-
- $hidden_fields = array(
- 'action' => '<input type="hidden" name="action" id="quickpost-action" value="'.$post_type.'-quickpress-save" />',
- 'post_id' => '<input type="hidden" name="quickpress_post_ID" value="'. $post_ID .'" />',
- 'post_type' => '<input type="hidden" name="post_type" value="'.$post_type.'" />',
- );
-
- $submit_fields = array(
- 'save' => '<input type="submit" name="save" id="save-post" class="button" tabindex="%s" value="'. esc_attr('Save Draft') .'" />',
- 'reset' => '<input type="reset" tabindex="%s" value="'. esc_attr( 'Reset' ).'" class="button" />',
- );
-
- $publishing_action = current_user_can('publish_posts') ? esc_attr('Publish') : esc_attr('Submit for Review');
-
- $publishing_fields = array(
- 'submit' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%s" class="button-primary" value="' . $publishing_action . '" />',
- /*'test' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%n" class="button-primary" value="'. esc_attr('Publish') .'" />', */
-
- );
-
- $defaults = array(
- 'action' => admin_url( 'post.php' ),
- 'fields' => $fields,
- 'form_id' => '',
- 'default_cap' => 'edit_posts',
- 'tabindex_start' => '1',
- 'ajax' => true,
- 'hidden_fields' => $hidden_fields,
- 'submit_fields' => $submit_fields,
- 'publishing_fields' => $publishing_fields,
- 'submit_class' => 'submit',
- 'publish_action_container' => 'span',
- 'publish_action_id' => 'publishing-action',
- 'hidden_and_submit_fields_container' => 'p',
- 'hidden_and_submit_fields_container_class' => 'submit',
- );
-
- $args = wp_parse_args($args, $defaults);
-
- $tabindex = apply_filters( 'quickpress_tabindex_start', $args['tabindex_start'], $args['form_id'] );
-
- if ( current_user_can( $args['default_cap'] ) ): ?>
- <?php do_action('quickpress_form_before_form', $args['form_id'] ); ?>
- <form name="post" action="<?php echo $args['action'] ?>" method="post" id="<?php echo $args['form_id']; ?>">
- <?php do_action('quickpress_form_before_fields', $args['form_id']);
-
- $fields = apply_filters( 'quickpress_fields', $args['fields'], $args['form_id'] );
- foreach ($fields as $title => $field){
- if ( empty( $field['capability'] ) || current_user_can( $field['capability'] ) ){
- printf( $field['output'], $args['form_id'], $args['form_id'], $tabindex );
- $tabindex++;
- }
- }
- //Hidden Fields
- do_action('quickpress_form_after_fields', $args['form_id'] );
-
- echo "<{$args['hidden_and_submit_fields_container']} class='{$args['hidden_and_submit_fields_container_class']}'>";
-
- $hidden_fields = apply_filters( 'quickpress_hidden_fields', $args['hidden_fields'] , $args['form_id'] );
-
- foreach( $hidden_fields as $hidden_field )
- echo $hidden_field;
-
- // nonce
- wp_nonce_field('add-post');
-
- // submit
- foreach( $args['submit_fields'] as $submit_field )
- printf( $submit_field, $tabindex++ );
-
- // publish
- echo "<{$args['publish_action_container']} id='{$args['publish_action_id']}'>";
-
- $publishing_fields = apply_filters( 'quickpress_publishing_fields', $args['publishing_fields'] , $args['form_id'] );
-
- foreach( $publishing_fields as $publishing_field) {
- printf( $publishing_field, $tabindex );
- $tabindex++;
- }
-
- if ($args['ajax'] == true)
- echo '<img class="waiting" src="'. esc_url( admin_url( 'images/wpspin_light.gif' ) ) .'" />';
-
- echo "</{$args['publish_action_container']}>";
- echo "<br class='clear' />";
- do_action( 'quickpress_form_after_submit_fields', $args['form_id']);
-
- echo "</{$args['hidden_and_submit_fields_container']}";
- do_action( 'quickpress_form_after_form_content', $args['form_id']);
- echo '</form>';
- do_action('quickpress_form_after_form', $args['form_id'] );
- else:
- do_action( 'quickpress_form_no_form', $args['form_id'] );
- endif;
-}
-
-/**
</del><span class="cx"> * Returns an array of post format slugs to their translated and pretty display versions
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16534 => 16535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-22 17:05:14 UTC (rev 16534)
+++ trunk/wp-includes/taxonomy.php 2010-11-22 17:17:26 UTC (rev 16535)
</span><span class="lines">@@ -2946,50 +2946,7 @@
</span><span class="cx"> return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $post_id
- * @return unknown
- */
-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_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 = esc_attr( $tags_to_edit );
- $tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
-
- return $tags_to_edit;
-}
-
-/**
</del><span class="cx"> * Returns the term's parent's term_ID
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span></span></pre>
</div>
</div>
</body>
</html>