Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php (revision 15691)
+++ wp-includes/taxonomy.php (working copy)
@@ -2828,46 +2828,3 @@
return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
}
-
-
-/**
- * {@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;
-}
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php (revision 15691)
+++ wp-includes/post.php (working copy)
@@ -4716,202 +4716,233 @@
/**
- * Default post information to use when populating the "Write Post" form.
+ * Returns or echos a form containing a post box.
*
- * @since unknown
+ * Used for the QuickPress dashboard module.
*
- *@param string A post type string, defaults to 'post'.
- * @return object stdClass object containing all the default post data as attributes
+ * @since 3.1.0
+ *
+ * @param array $args Arguments.
*/
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
- global $wpdb;
+function wp_quickpress_form( $args = array() ) {
+ $defaults = array(
+ 'form_id' => '',
+ 'action' => admin_url( 'post.php' ),
+ 'post' => null, // Post object, ID, or null.
+ 'post_type' => null, // Post type. Optional. Overridden if 'post' parameter is specified.
+ 'fields' => null, // Array of fields.
+ 'submit_fields' => null, // Array of submit, hidden, and publishing inputs.
+ 'tabindex' => false, // @todo Can we just kill tabindex?
+ 'capability' => 'edit_posts',
+ 'submit_class' => 'submit',
+ 'publish_action_container' => 'span',
+ 'publish_action_id' => 'publishing-action',
+ 'submit_fields_container' => 'p',
+ 'submit_fields_container_class' => 'submit',
+ );
- $post_title = '';
- if ( !empty( $_REQUEST['post_title'] ) )
- $post_title = esc_html( stripslashes( $_REQUEST['post_title'] ));
+ $args = wp_parse_args( $args, $defaults );
- $post_content = '';
- if ( !empty( $_REQUEST['content'] ) )
- $post_content = esc_html( stripslashes( $_REQUEST['content'] ));
+ // @todo Kill the cap check and arg. Stick to pure presentation only.
+ // We can still handle them on a field-by-field basis.
+ if ( ! current_user_can( $args['capability'] ) ) {
+ do_action( 'quickpress_form_no_form', $args );
+ return;
+ }
- $post_excerpt = '';
- if ( !empty( $_REQUEST['excerpt'] ) )
- $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] ));
+ if (! function_exists('get_terms_to_edit') )
+ require_once (ABSPATH . 'wp-admin/includes/taxonomy.php');
- 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 );
+ if (! function_exists('get_default_post_to_edit') )
+ require_once (ABSPATH . 'wp-admin/includes/post.php');
+
+ if ( empty( $args['post'] ) ) {
+ if ( null === $args['post_type'] )
+ $args['post_type'] = 'post';
+ $args['post'] = 0;
} 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 = get_post( $args['post'] );
+ $args['post_type'] = $post->post_type;
}
- $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 = '';
+ $post_type_obj = get_post_type_object( $args['post_type'] );
- 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(
+ // @todo Clean these up still. Arrays?
+ $default_fields = array(
'title' => array(
'capability' => '', // Capability to check before outputing field
- 'output' => '
+ 'output' => '
-
+
'
),
+ // @todo This needs JS enqueued to work.
'media_buttons' => array(
'capability' => 'upload_files',
- 'output' => ''. get_media_buttons() .'
',
+ 'output' => ''. get_media_buttons() .'
',
),
+ // @todo The TinyMCE stuff should disappear into a hook, like the ajax spinner.
'content' => array(
'capability' => '',
- 'output' => '
+ 'output' => '
-
+
- '."
+ '."
"
-
),
'tags' => array(
'capability' =>'',
'output' => '
-
+
-
-
-'
+
+ '
),
-
);
- $hidden_fields = array(
- 'action' => '',
- 'post_id' => '',
- 'post_type' => '',
- );
+ if ( null === $args['fields'] ) {
+ $fields = $default_fields;
+ } else {
+ $fields = array();
+ foreach ( $args['fields'] as $key => $value ) {
+ if ( true === $value ) // i.e. tags => true
+ $fields[] = $default_fields[ $key ];
+ elseif ( is_string( $value ) ) // i.e. array( 'tags' )
+ $fields[] = $default_fields[ $value ];
+ else
+ $fields[] = $value;
+ }
+ }
+ // Sync this so filters are given correct information.
+ $args['fields'] = $fields;
- $submit_fields = array(
- 'save' => '',
- 'reset' => '',
+ $publishing_action = current_user_can( $post_type_obj->cap->publish_posts ) ? __( 'Publish' ) : __( 'Submit for Review' );
+
+ // These are keyed by input name.
+ // Accepted keys: type, value, id (defaults to none).
+ // These are also accepted for non-hidden inputs:
+ // primary (defaults to false), class (defaults to 'button', except for the primary button, when it is 'button-primary'),
+ // tabindex (defaults to true), accesskey (defaults to none).
+ $default_submit_fields = array(
+ 'action' => array( 'type' => 'hidden', 'id' => 'quickpost-action', 'value' => $post_type . '-quickpress-save' ),
+ 'quickpress_post_ID' => array( 'type' => 'hidden', 'value' => $post_ID ),
+ 'post_type' => array( 'type' => 'hidden', 'value' => $post_type ),
+ 'save' => array( 'type' => 'submit', 'value' => __( 'Save Draft' ) ),
+ 'reset' => array( 'type' => 'reset', 'value' => __( 'Reset' ) ),
+ 'submit' => array( 'type' => 'submit', 'primary' => true, 'accesskey' => 'p', 'value' => $publishing_action ),
);
- $publishing_action = current_user_can('publish_posts') ? esc_attr('Publish') : esc_attr('Submit for Review');
+ if ( null === $args['submit_fields'] ) {
+ $submit_fields = $default_submit_fields;
+ } else {
+ $submit_fields = array();
+ foreach ( $args['submit_fields'] as $key => $value ) {
+ // @todo If this is going to work like this, then the hidden/submit fields need to be split back up.
+ if ( true === $value ) // i.e. tags => true
+ $submit_fields[] = $default_submit_fields[ $key ];
+ elseif ( is_string( $value ) ) // i.e. array( 'tags' )
+ $submit_fields[] = $default_submit_fields[ $value ];
+ else
+ $submit_fields[] = $value;
+ }
+ }
- $publishing_fields = array(
- 'submit' => '',
- /*'test' => '', */
+ $primary_fields = array();
+ foreach ( $submit_fields as $key => $f ) {
+ if ( ! isset( $f['type'] ) || ! isset( $f['value'] ) )
+ continue;
+ $f['name'] = $key;
+ if ( ! isset( $f['id'] ) )
+ $f['id'] = false;
- );
+ if ( 'hidden' == $f['type'] ) {
+ $f['primary'] = $f['accesskey'] = $f['tabindex'] = $f['class'] = false;
+ } else {
+ if ( ! isset( $f['class'] ) )
+ $f['class'] = ! empty( $f['primary'] ) ? 'button-primary' : 'button';
+ $f = wp_parse_args( $f, array( 'accesskey' => false, 'tabindex' => true, 'primary' => false, 'tabindex' => true ) );
+ }
+ }
- $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',
- );
+ // Sync this so filters are given correct information.
+ $args['submit_fields'] = $submit_fields;
+ // Then we can separate the primary fields.
+ foreach ( $submit_fields as $key => $f ) {
+ if ( $f['primary'] ) {
+ $primary_fields[] = $f;
+ unset( $submit_fields[ $key ] );
+ }
+ }
- $args = wp_parse_args($args, $defaults);
+ // @todo :(
+ $tabindex = apply_filters( 'quickpress_tabindex', $tabindex, $args );
- $tabindex = apply_filters( 'quickpress_tabindex_start', $args['tabindex_start'], $args['form_id'] );
+ do_action('quickpress_before_form', $args );
- if ( current_user_can( $args['default_cap'] ) ): ?>
-
-