X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..58f607a1de715c9bca69340a4d6fb9e1b9c2bed2:/wp-admin/includes/post.php diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index e5924f1d..6448c9e9 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -31,6 +31,9 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { if ( isset($post_data['trackback_url']) ) $post_data['to_ping'] = $post_data['trackback_url']; + if ( !isset($post_data['user_ID']) ) + $post_data['user_ID'] = $GLOBALS['user_ID']; + if (!empty ( $post_data['post_author_override'] ) ) { $post_data['post_author'] = (int) $post_data['post_author_override']; } else { @@ -41,16 +44,15 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { } } + $ptype = get_post_type_object( $post_data['post_type'] ); if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) { - if ( 'page' == $post_data['post_type'] ) { - if ( !current_user_can( 'edit_others_pages' ) ) { + if ( !current_user_can( $ptype->cap->edit_others_posts ) ) { + if ( 'page' == $post_data['post_type'] ) { return new WP_Error( 'edit_others_pages', $update ? __( 'You are not allowed to edit pages as this user.' ) : __( 'You are not allowed to create pages as this user.' ) ); - } - } else { - if ( !current_user_can( 'edit_others_posts' ) ) { + } else { return new WP_Error( 'edit_others_posts', $update ? __( 'You are not allowed to edit posts as this user.' ) : __( 'You are not allowed to post as this user.' ) @@ -64,26 +66,23 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { $post_data['post_status'] = 'draft'; if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) $post_data['post_status'] = 'private'; - if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( $post_data['post_status'] != 'private' ) ) + if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) ) $post_data['post_status'] = 'publish'; if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) $post_data['post_status'] = 'draft'; if ( isset($post_data['pending']) && '' != $post_data['pending'] ) $post_data['post_status'] = 'pending'; - $previous_status = get_post_field('post_status', isset($post_data['ID']) ? $post_data['ID'] : $post_data['temp_ID']); + if ( isset( $post_data['ID'] ) ) + $post_id = $post_data['ID']; + else + $post_id = false; + $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false; // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. - if ( 'page' == $post_data['post_type'] ) { - $publish_cap = 'publish_pages'; - $edit_cap = 'edit_published_pages'; - } else { - $publish_cap = 'publish_posts'; - $edit_cap = 'edit_published_posts'; - } - if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $publish_cap )) ) - if ( $previous_status != 'publish' || !current_user_can( $edit_cap ) ) + if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->cap->publish_posts )) ) + if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) ) $post_data['post_status'] = 'pending'; if ( ! isset($post_data['post_status']) ) @@ -138,11 +137,11 @@ function edit_post( $post_data = null ) { $post_ID = (int) $post_data['post_ID']; - if ( 'page' == $post_data['post_type'] ) { - if ( !current_user_can( 'edit_page', $post_ID ) ) + $ptype = get_post_type_object($post_data['post_type']); + if ( !current_user_can( $ptype->cap->edit_post, $post_ID ) ) { + if ( 'page' == $post_data['post_type'] ) wp_die( __('You are not allowed to edit this page.' )); - } else { - if ( !current_user_can( 'edit_post', $post_ID ) ) + else wp_die( __('You are not allowed to edit this post.' )); } @@ -157,6 +156,8 @@ function edit_post( $post_data = null ) { } $post_data = _wp_translate_postdata( true, $post_data ); + if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] ) + $post_data['post_status'] = 'draft'; if ( is_wp_error($post_data) ) wp_die( $post_data->get_error_message() ); @@ -189,6 +190,8 @@ function edit_post( $post_data = null ) { add_meta( $post_ID ); + update_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID ); + wp_update_post( $post_data ); // Reunite any orphaned attachments with their parent @@ -213,13 +216,14 @@ function edit_post( $post_data = null ) { } /** - * {@internal Missing Short Description}} + * Process the post data for the bulk editing of posts. * * Updates all bulk edited posts/pages, adding (but not removing) tags and * categories. Skips pages when they would be their own parent or child. * - * @since unknown + * @since 2.7.0 * + * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal. * @return array */ function bulk_edit_posts( $post_data = null ) { @@ -228,12 +232,16 @@ function bulk_edit_posts( $post_data = null ) { if ( empty($post_data) ) $post_data = &$_POST; - if ( isset($post_data['post_type']) && 'page' == $post_data['post_type'] ) { - if ( ! current_user_can( 'edit_pages' ) ) - wp_die( __('You are not allowed to edit pages.') ); - } else { - if ( ! current_user_can( 'edit_posts' ) ) - wp_die( __('You are not allowed to edit posts.') ); + if ( isset($post_data['post_type']) ) + $ptype = get_post_type_object($post_data['post_type']); + else + $ptype = get_post_type_object('post'); + + if ( !current_user_can( $ptype->cap->edit_posts ) ) { + if ( 'page' == $ptype->name ) + wp_die( __('You are not allowed to edit pages.')); + else + wp_die( __('You are not allowed to edit posts.')); } if ( -1 == $post_data['_status'] ) { @@ -246,7 +254,7 @@ function bulk_edit_posts( $post_data = null ) { $post_IDs = array_map( 'intval', (array) $post_data['post'] ); - $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category', 'sticky' ); + $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tax_input', 'post_category', 'sticky' ); foreach ( $reset as $field ) { if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) unset($post_data[$field]); @@ -259,9 +267,18 @@ function bulk_edit_posts( $post_data = null ) { unset($post_data['post_category']); } - if ( isset($post_data['tags_input']) ) { - $new_tags = preg_replace( '/\s*,\s*/', ',', rtrim( trim($post_data['tags_input']), ' ,' ) ); - $new_tags = explode(',', $new_tags); + $tax_input = array(); + if ( isset($post_data['tax_input'])) { + foreach ( $post_data['tax_input'] as $tax_name => $terms ) { + if ( empty($terms) ) + continue; + if ( is_taxonomy_hierarchical( $tax_name ) ) + $tax_input[$tax_name] = array_map( 'absint', $terms ); + else { + $tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) ); + $tax_input[$tax_name] = explode(',', $tax_input[$tax_name]); + } + } } if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) { @@ -282,8 +299,9 @@ function bulk_edit_posts( $post_data = null ) { $updated = $skipped = $locked = array(); foreach ( $post_IDs as $post_ID ) { + $post_type_object = get_post_type_object( get_post_type( $post_ID ) ); - if ( isset($children) && in_array($post_ID, $children) ) { + if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( $post_type_object->cap->edit_post, $post_ID ) ) { $skipped[] = $post_ID; continue; } @@ -293,14 +311,26 @@ function bulk_edit_posts( $post_data = null ) { continue; } - if ( isset($new_cats) ) { - $cats = (array) wp_get_post_categories($post_ID); - $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) ); + $tax_names = get_object_taxonomies( get_post($post_ID) ); + foreach ( $tax_names as $tax_name ) { + $taxonomy_obj = get_taxonomy($tax_name); + if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) + $new_terms = $tax_input[$tax_name]; + else + $new_terms = array(); + + if ( $taxonomy_obj->hierarchical ) + $current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') ); + else + $current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') ); + + $post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms ); } - if ( isset($new_tags) ) { - $tags = wp_get_post_tags($post_ID, array('fields' => 'names')); - $post_data['tags_input'] = array_unique( array_merge($tags, $new_tags) ); + if ( isset($new_cats) && in_array( 'category', $tax_names ) ) { + $cats = (array) wp_get_post_categories($post_ID); + $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) ); + unset( $post_data['tax_input']['category'] ); } $post_data['ID'] = $post_ID; @@ -323,9 +353,11 @@ function bulk_edit_posts( $post_data = null ) { * * @since unknown * - * @return 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() { +function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) { + global $wpdb; $post_title = ''; if ( !empty( $_REQUEST['post_title'] ) ) @@ -339,36 +371,46 @@ function get_default_post_to_edit() { if ( !empty( $_REQUEST['excerpt'] ) ) $post_excerpt = esc_html( stripslashes( $_REQUEST['excerpt'] )); - $post->ID = 0; + 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 = ''; - $post->post_author = ''; - $post->post_date = ''; - $post->post_date_gmt = ''; - $post->post_password = ''; - $post->post_status = 'draft'; - $post->post_type = 'post'; - $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->post_content = apply_filters( 'default_content', $post_content); - $post->post_title = apply_filters( 'default_title', $post_title ); - $post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt); - $post->page_template = 'default'; - $post->post_parent = 0; - $post->menu_order = 0; return $post; } /** - * {@internal Missing Short Description}} + * Get the default page information to use. * - * @since unknown + * @since 2.5.0 * - * @return unknown + * @return object stdClass object containing all the default post data as attributes */ function get_default_page_to_edit() { $page = get_default_post_to_edit(); @@ -445,16 +487,21 @@ function post_exists($title, $content = '', $date = '') { function wp_write_post() { global $user_ID; - if ( 'page' == $_POST['post_type'] ) { - if ( !current_user_can( 'edit_pages' ) ) - return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) ); - } else { - if ( !current_user_can( 'edit_posts' ) ) - return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) ); - } + if ( isset($_POST['post_type']) ) + $ptype = get_post_type_object($_POST['post_type']); + else + $ptype = get_post_type_object('post'); + + if ( !current_user_can( $ptype->cap->edit_posts ) ) { + if ( 'page' == $ptype->name ) + return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) ); + else + return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) ); + } // Check for autosave collisions + // Does this need to be updated? ~ Mark $temp_id = false; if ( isset($_POST['temp_ID']) ) { $temp_id = (int) $_POST['temp_ID']; @@ -502,7 +549,10 @@ function wp_write_post() { add_meta( $post_ID ); + add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID ); + // Reunite any orphaned attachments with their parent + // Does this need to be udpated? ~ Mark if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) $draft_ids = array(); if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) ) @@ -533,7 +583,7 @@ function wp_write_post() { */ function write_post() { $result = wp_write_post(); - if( is_wp_error( $result ) ) + if ( is_wp_error( $result ) ) wp_die( $result->get_error_message() ); else return $result; @@ -577,8 +627,7 @@ function add_meta( $post_ID ) { return false; wp_cache_delete($post_ID, 'post_meta'); - - $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) ); + $wpdb->insert( $wpdb->postmeta, array( 'post_id' => $post_ID, 'meta_key' => $metakey, 'meta_value' => $metavalue ) ); do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, $metakey, $metavalue ); return $wpdb->insert_id; @@ -670,8 +719,8 @@ function has_meta( $postid ) { * @since unknown * * @param unknown_type $meta_id - * @param unknown_type $meta_key - * @param unknown_type $meta_value + * @param unknown_type $meta_key Expect Slashed + * @param unknown_type $meta_value Expect Slashed * @return unknown */ function update_meta( $meta_id, $meta_key, $meta_value ) { @@ -679,6 +728,8 @@ function update_meta( $meta_id, $meta_key, $meta_value ) { $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' ); + $meta_key = stripslashes($meta_key); + if ( in_array($meta_key, $protected) ) return false; @@ -738,8 +789,8 @@ function _fix_attachment_links( $post_ID ) { if ( ! empty( $attachment) && ! is_object( get_post( $attachment['post_parent'] ) ) ) { $attachment['post_parent'] = $post_ID; // Escape data pulled from DB. - $attachment = add_magic_quotes( $attachment); - wp_update_post( $attachment); + $attachment = add_magic_quotes( $attachment ); + wp_update_post( $attachment ); } $post_search[$i] = $anchor; @@ -789,12 +840,12 @@ function _relocate_children( $old_ID, $new_ID ) { } /** - * {@internal Missing Short Description}} + * Get all the possible statuses for a post_type * - * @since unknown + * @since 2.5.0 * - * @param unknown_type $type - * @return unknown + * @param string $type The post_type you want the statuses for + * @return array As array of all the statuses for the supplied post type */ function get_available_post_statuses($type = 'post') { $stati = wp_count_posts($type); @@ -803,35 +854,30 @@ function get_available_post_statuses($type = 'post') { } /** - * {@internal Missing Short Description}} + * Run the wp query to fetch the posts for listing on the edit posts page * - * @since unknown + * @since 2.5.0 * - * @param unknown_type $q - * @return unknown + * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal. + * @return array */ function wp_edit_posts_query( $q = false ) { if ( false === $q ) $q = $_GET; - $q['m'] = isset($q['m']) ? (int) $q['m'] : 0; + $q['m'] = isset($q['m']) ? (int) $q['m'] : 0; $q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0; - $post_stati = array( // array( adj, noun ) - 'publish' => array(_x('Published', 'post'), __('Published posts'), _n_noop('Published (%s)', 'Published (%s)')), - 'future' => array(_x('Scheduled', 'post'), __('Scheduled posts'), _n_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(_x('Pending Review', 'post'), __('Pending posts'), _n_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(_x('Draft', 'post'), _x('Drafts', 'manage posts header'), _n_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(_x('Private', 'post'), __('Private posts'), _n_noop('Private (%s)', 'Private (%s)')), - 'trash' => array(_x('Trash', 'post'), __('Trash posts'), _n_noop('Trash (%s)', 'Trash (%s)')), - ); - - $post_stati = apply_filters('post_stati', $post_stati); - - $avail_post_stati = get_available_post_statuses('post'); - - $post_status_q = ''; - if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) { - $post_status_q = '&post_status=' . $q['post_status']; - $post_status_q .= '&perm=readable'; + $post_stati = get_post_stati(); + + if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) ) + $post_type = $q['post_type']; + else + $post_type = 'post'; + + $avail_post_stati = get_available_post_statuses($post_type); + + if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) { + $post_status = $q['post_status']; + $perm = 'readable'; } if ( isset($q['post_status']) && 'pending' === $q['post_status'] ) { @@ -845,14 +891,27 @@ function wp_edit_posts_query( $q = false ) { $orderby = 'date'; } - $posts_per_page = (int) get_user_option( 'edit_per_page', 0, false ); + $per_page = 'edit_' . $post_type . '_per_page'; + $posts_per_page = (int) get_user_option( $per_page ); if ( empty( $posts_per_page ) || $posts_per_page < 1 ) - $posts_per_page = 15; - $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page ); + $posts_per_page = 20; + + $posts_per_page = apply_filters( $per_page, $posts_per_page ); + $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type ); - wp("post_type=post&$post_status_q&posts_per_page=$posts_per_page&order=$order&orderby=$orderby"); + $query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page'); - return array($post_stati, $avail_post_stati); + // Hierarchical types require special args. + if ( is_post_type_hierarchical( $post_type ) ) { + $query['orderby'] = 'menu_order title'; + $query['order'] = 'asc'; + $query['posts_per_page'] = -1; + $query['posts_per_archive_page'] = -1; + } + + wp( $query ); + + return $avail_post_stati; } /** @@ -903,7 +962,7 @@ function wp_edit_attachments_query( $q = false ) { $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0; $q['post_type'] = 'attachment'; $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : 'inherit'; - $media_per_page = (int) get_user_option( 'upload_per_page', 0, false ); + $media_per_page = (int) get_user_option( 'upload_per_page' ); if ( empty( $media_per_page ) || $media_per_page < 1 ) $media_per_page = 20; $q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page ); @@ -922,6 +981,7 @@ function wp_edit_attachments_query( $q = false ) { /** * {@internal Missing Short Description}} * + * @uses get_user_option() * @since unknown * * @param unknown_type $id @@ -931,9 +991,11 @@ function wp_edit_attachments_query( $q = false ) { function postbox_classes( $id, $page ) { if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) return ''; - $current_user = wp_get_current_user(); - if ( $closed = get_user_option('closedpostboxes_'.$page, 0, false ) ) { - if ( !is_array( $closed ) ) return ''; + + if ( $closed = get_user_option('closedpostboxes_'.$page ) ) { + if ( !is_array( $closed ) ) { + return ''; + } return in_array( $id, $closed )? 'closed' : ''; } else { return ''; @@ -945,47 +1007,51 @@ function postbox_classes( $id, $page ) { * * @since unknown * - * @param int|object $id Post ID or post object. - * @param string $title (optional) Title - * @param string $name (optional) Name - * @return array With two entries of type string + * @param int|object $id Post ID or post object. + * @param string $title (optional) Title + * @param string $name (optional) Name + * @return array With two entries of type string */ function get_sample_permalink($id, $title = null, $name = null) { $post = &get_post($id); - if (!$post->ID) { + if ( !$post->ID ) return array('', ''); - } + + $ptype = get_post_type_object($post->post_type); + $original_status = $post->post_status; $original_date = $post->post_date; $original_name = $post->post_name; // Hack: get_permalink would return ugly permalink for // drafts, so we will fake, that our post is published - if (in_array($post->post_status, array('draft', 'pending'))) { + if ( in_array($post->post_status, array('draft', 'pending')) ) { $post->post_status = 'publish'; $post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID); } - $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent); - // If the user wants to set a new name -- override the current one // Note: if empty name is supplied -- use the title instead, see #6072 - if (!is_null($name)) { + if ( !is_null($name) ) $post->post_name = sanitize_title($name ? $name : $title, $post->ID); - } + + $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent); $post->filter = 'sample'; $permalink = get_permalink($post, true); + // Replace custom post_type Token with generic pagename token for ease of use. + $permalink = str_replace("%$post->post_type%", '%pagename%', $permalink); + // Handle page hierarchy - if ( 'page' == $post->post_type ) { - $uri = get_page_uri($post->ID); + if ( $ptype->hierarchical ) { + $uri = get_page_uri($post); $uri = untrailingslashit($uri); $uri = strrev( stristr( strrev( $uri ), '/' ) ); $uri = untrailingslashit($uri); if ( !empty($uri) ) - $uri .='/'; + $uri .= '/'; $permalink = str_replace('%pagename%', "${uri}%pagename%", $permalink); } @@ -1002,20 +1068,23 @@ function get_sample_permalink($id, $title = null, $name = null) { * sample permalink html * * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. - * + * * @since unknown * - * @param int|object $id Post ID or post object. - * @param string $new_title (optional) New title - * @param string $new_slug (optional) New slug - * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. + * @param int|object $id Post ID or post object. + * @param string $new_title (optional) New title + * @param string $new_slug (optional) New slug + * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. */ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { + global $wpdb; $post = &get_post($id); + list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug); if ( 'publish' == $post->post_status ) { - $view_post = 'post' == $post->post_type ? __('View Post') : __('View Page'); + $ptype = get_post_type_object($post->post_type); + $view_post = $ptype->labels->view_item; $title = __('Click to edit this part of the permalink'); } else { $title = __('Temporary permalink. Click to edit this part.'); @@ -1050,7 +1119,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { $post_name_html = '' . $post_name_abridged . ''; $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink); $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink); - $return = '' . __('Permalink:') . "\n" . '' . $display_link . "\n"; + $return = '' . __('Permalink:') . "\n"; + $return .= '' . $display_link . "\n"; + $return .= '‎'; // Fix bi-directional text display defect in RTL languages. $return .= '' . __('Edit') . "\n"; $return .= '' . $post_name . "\n"; if ( isset($view_post) ) @@ -1070,8 +1141,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { * @return string html */ function _wp_post_thumbnail_html( $thumbnail_id = NULL ) { - global $content_width, $_wp_additional_image_sizes; - $content = '

' . esc_html__( 'Set thumbnail' ) . '

'; + global $content_width, $_wp_additional_image_sizes, $post_ID; + $set_thumbnail_link = '

%s

'; + $content = sprintf($set_thumbnail_link, esc_html__( 'Set featured image' )); if ( $thumbnail_id && get_post( $thumbnail_id ) ) { $old_content_width = $content_width; @@ -1081,8 +1153,9 @@ function _wp_post_thumbnail_html( $thumbnail_id = NULL ) { else $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' ); if ( !empty( $thumbnail_html ) ) { - $content = '' . $thumbnail_html . ''; - $content .= '

' . esc_html__( 'Remove thumbnail' ) . '

'; + $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$post_ID" ); + $content = sprintf($set_thumbnail_link, $thumbnail_html); + $content .= '

' . esc_html__( 'Remove featured image' ) . '

'; } $content_width = $old_content_width; } @@ -1099,8 +1172,6 @@ function _wp_post_thumbnail_html( $thumbnail_id = NULL ) { * @return bool|int False: not locked or locked by current user. Int: user ID of user with lock. */ function wp_check_post_lock( $post_id ) { - global $current_user; - if ( !$post = get_post( $post_id ) ) return false; @@ -1109,7 +1180,7 @@ function wp_check_post_lock( $post_id ) { $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 ); - if ( $lock && $lock > time() - $time_window && $last != $current_user->ID ) + if ( $lock && $lock > time() - $time_window && $last != get_current_user_id() ) return $last; return false; } @@ -1123,18 +1194,14 @@ function wp_check_post_lock( $post_id ) { * @return bool Returns false if the post doesn't exist of there is no current user */ function wp_set_post_lock( $post_id ) { - global $current_user; if ( !$post = get_post( $post_id ) ) return false; - if ( !$current_user || !$current_user->ID ) + if ( 0 == get_current_user_id() ) return false; $now = time(); - if ( !add_post_meta( $post->ID, '_edit_lock', $now, true ) ) - update_post_meta( $post->ID, '_edit_lock', $now ); - if ( !add_post_meta( $post->ID, '_edit_last', $current_user->ID, true ) ) - update_post_meta( $post->ID, '_edit_last', $current_user->ID ); + update_post_meta( $post->ID, '_edit_lock', $now ); } /** @@ -1172,6 +1239,8 @@ function _admin_notice_post_locked() { * * @uses _wp_translate_postdata() * @uses _wp_post_revision_fields() + * + * @return unknown */ function wp_create_post_autosave( $post_id ) { $translated = _wp_translate_postdata( true ); @@ -1182,8 +1251,7 @@ function wp_create_post_autosave( $post_id ) { if ( $old_autosave = wp_get_post_autosave( $post_id ) ) { $new_autosave = _wp_post_revision_fields( $_POST, true ); $new_autosave['ID'] = $old_autosave->ID; - $current_user = wp_get_current_user(); - $new_autosave['post_author'] = $current_user->ID; + $new_autosave['post_author'] = get_current_user_id(); return wp_update_post( $new_autosave ); } @@ -1198,7 +1266,7 @@ function wp_create_post_autosave( $post_id ) { * Save draft or manually autosave for showing preview. * * @package WordPress - * @since 2.7 + * @since 2.7.0 * * @uses wp_write_post() * @uses edit_post() @@ -1211,7 +1279,8 @@ function wp_create_post_autosave( $post_id ) { function post_preview() { $post_ID = (int) $_POST['post_ID']; - if ( $post_ID < 1 ) + $status = get_post_status( $post_ID ); + if ( 'auto-draft' == $status ) wp_die( __('Preview not available. Please save as a draft first.') ); if ( isset($_POST['catslist']) ) @@ -1259,7 +1328,7 @@ function post_preview() { * Adds the TinyMCE editor used on the Write and Edit screens. * * @package WordPress - * @since 2.7 + * @since 2.7.0 * * TinyMCE is loaded separately from other Javascript by using wp-tinymce.php. It outputs concatenated * and optionaly pre-compressed version of the core and all default plugins. Additional plugins are loaded @@ -1270,7 +1339,7 @@ function post_preview() { * @param mixed $settings optional An array that can add to or overwrite the default TinyMCE settings. */ function wp_tiny_mce( $teeny = false, $settings = false ) { - global $concatenate_scripts, $compress_scripts, $tinymce_version; + global $concatenate_scripts, $compress_scripts, $tinymce_version, $editor_styles; if ( ! user_can_richedit() ) return; @@ -1382,7 +1451,10 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' )); $mce_buttons = implode($mce_buttons, ','); - $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' )); + $mce_buttons_2 = array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ); + if ( is_multisite() ) + unset( $mce_buttons_2[ array_search( 'media', $mce_buttons_2 ) ] ); + $mce_buttons_2 = apply_filters('mce_buttons_2', $mce_buttons_2); $mce_buttons_2 = implode($mce_buttons_2, ','); $mce_buttons_3 = apply_filters('mce_buttons_3', array()); @@ -1391,7 +1463,7 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { $mce_buttons_4 = apply_filters('mce_buttons_4', array()); $mce_buttons_4 = implode($mce_buttons_4, ','); } - $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false; + $no_captions = (bool) apply_filters( 'disable_captions', '' ); // TinyMCE init settings $initArray = array ( @@ -1400,12 +1472,12 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { 'width' => '100%', 'theme' => 'advanced', 'skin' => 'wp_theme', - 'theme_advanced_buttons1' => "$mce_buttons", - 'theme_advanced_buttons2' => "$mce_buttons_2", - 'theme_advanced_buttons3' => "$mce_buttons_3", - 'theme_advanced_buttons4' => "$mce_buttons_4", - 'language' => "$mce_locale", - 'spellchecker_languages' => "$mce_spellchecker_languages", + 'theme_advanced_buttons1' => $mce_buttons, + 'theme_advanced_buttons2' => $mce_buttons_2, + 'theme_advanced_buttons3' => $mce_buttons_3, + 'theme_advanced_buttons4' => $mce_buttons_4, + 'language' => $mce_locale, + 'spellchecker_languages' => $mce_spellchecker_languages, 'theme_advanced_toolbar_location' => 'top', 'theme_advanced_toolbar_align' => 'left', 'theme_advanced_statusbar_location' => 'bottom', @@ -1426,13 +1498,35 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { 'paste_remove_spans' => true, 'paste_strip_class_attributes' => 'all', 'wpeditimage_disable_captions' => $no_captions, - 'plugins' => "$plugins" + 'plugins' => $plugins ); - $mce_css = trim(apply_filters('mce_css', ''), ' ,'); + if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) { + $mce_css = array(); + $style_uri = get_stylesheet_directory_uri(); + if ( TEMPLATEPATH == STYLESHEETPATH ) { + foreach ( $editor_styles as $file ) + $mce_css[] = "$style_uri/$file"; + } else { + $style_dir = get_stylesheet_directory(); + $template_uri = get_template_directory_uri(); + $template_dir = get_template_directory(); + foreach ( $editor_styles as $file ) { + if ( file_exists( "$style_dir/$file" ) ) + $mce_css[] = "$style_uri/$file"; + if ( file_exists( "$template_dir/$file" ) ) + $mce_css[] = "$template_uri/$file"; + } + } + $mce_css = implode( ',', $mce_css ); + } else { + $mce_css = ''; + } + + $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' ); if ( ! empty($mce_css) ) - $initArray['content_css'] = "$mce_css"; + $initArray['content_css'] = $mce_css; if ( is_array($settings) ) $initArray = array_merge($initArray, $settings); @@ -1456,7 +1550,9 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { script_concat_settings(); $language = $initArray['language']; - $zip = $compress_scripts ? 1 : 0; + + $compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING']) + && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip'); /** * Deprecated @@ -1490,8 +1586,8 @@ tinyMCEPreInit = { \n"; + if ( $compressed ) + echo "\n"; else echo "\n"; @@ -1504,7 +1600,7 @@ tinyMCEPreInit = {