<!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>[15688] trunk: Move some post and taxonomy functions from admin/
includes to wp-includes in preparation for QuickPress template tag.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15688">15688</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-03 02:58:59 +0000 (Sun, 03 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move some post and taxonomy functions from admin/includes to wp-includes in preparation for QuickPress template tag. Moves get_tags_to_edit, get_terms_to_edit, get_default_post_to_edit, media_buttons, _media_button, get_upload_iframe_src. Also introduce get_media_buttons as a wrapper for media_buttons. props jorbin, 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 (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-admin/includes/media.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -349,56 +349,7 @@
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><del>- */
-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}}
</del><span class="cx"> *
</span><del>- * @since unknown
- *
</del><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 (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-admin/includes/post.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -348,63 +348,8 @@
</span><span class="cx"> return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * 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;
</del><span class="cx">
</span><del>- $post_title = '';
- if ( !empty( $_REQUEST['post_title'] ) )
- $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
</del><span class="cx">
</span><del>- $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;
-}
-
</del><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 (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/taxonomy.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-admin/includes/taxonomy.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -194,48 +194,6 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @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
- *
</del><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 (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-includes/media.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -1395,3 +1395,63 @@
</span><span class="cx"> $oembed = _wp_oembed_get_object();
</span><span class="cx"> $oembed->providers[$format] = array( $provider, $regex );
</span><span class="cx"> }
</span><ins>+
+/**
+ *
+ *
+ *
+ */
+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' );
+
+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);
+}
</ins></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-includes/post.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -2074,7 +2074,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">@@ -4713,3 +4713,61 @@
</span><span class="cx"> add_filter('the_preview', '_set_preview');
</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 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;
+
+ $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;
+}
</ins></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15687 => 15688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-02 22:52:15 UTC (rev 15687)
+++ trunk/wp-includes/taxonomy.php 2010-10-03 02:58:59 UTC (rev 15688)
</span><span class="lines">@@ -2821,3 +2821,46 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
</span><span class="cx"> }
</span><ins>+
+
+/**
+ * {@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;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>