X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/16b9f61a8ab25bd6c9fbfd0cea00c7bda22f6a71..a6444c710cf37d7732aea76e752e43322b5036ca:/wp-includes/post.php diff --git a/wp-includes/post.php b/wp-includes/post.php index 2e980713..d5fb94dd 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -15,10 +15,126 @@ * Creates the initial post types when 'init' action is fired. */ function create_initial_post_types() { - register_post_type( 'post', array('exclude_from_search' => false) ); - register_post_type( 'page', array('exclude_from_search' => false) ); - register_post_type( 'attachment', array('exclude_from_search' => false) ); - register_post_type( 'revision', array('exclude_from_search' => true) ); + register_post_type( 'post', array( + 'public' => true, + '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ + '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ + 'capability_type' => 'post', + 'hierarchical' => false, + 'rewrite' => false, + 'query_var' => false, + 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions' ), + ) ); + + register_post_type( 'page', array( + 'public' => true, + '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ + '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ + 'capability_type' => 'page', + 'hierarchical' => true, + 'rewrite' => false, + 'query_var' => false, + 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ), + ) ); + + register_post_type( 'attachment', array( + 'labels' => array( + 'name' => __( 'Media' ), + ), + 'public' => true, + 'show_ui' => false, + '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ + '_edit_link' => 'media.php?attachment_id=%d', /* internal use only. don't use this when registering your own post type. */ + 'capability_type' => 'post', + 'hierarchical' => false, + 'rewrite' => false, + 'query_var' => false, + 'can_export' => false, + 'show_in_nav_menus' => false, + ) ); + + register_post_type( 'revision', array( + 'labels' => array( + 'name' => __( 'Revisions' ), + 'singular_name' => __( 'Revision' ), + ), + 'public' => false, + '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ + '_edit_link' => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */ + 'capability_type' => 'post', + 'hierarchical' => false, + 'rewrite' => false, + 'query_var' => false, + ) ); + + register_post_type( 'nav_menu_item', array( + 'labels' => array( + 'name' => __( 'Navigation Menu Items' ), + 'singular_name' => __( 'Navigation Menu Item' ), + ), + 'public' => false, + '_builtin' => true, /* internal use only. don't use this when registering your own post type. */ + 'capability_type' => 'post', + 'hierarchical' => false, + 'rewrite' => false, + 'query_var' => false, + ) ); + + register_post_status( 'publish', array( + 'label' => _x( 'Published', 'post' ), + 'public' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop( 'Published (%s)', 'Published (%s)' ), + ) ); + + register_post_status( 'future', array( + 'label' => _x( 'Scheduled', 'post' ), + 'protected' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop('Scheduled (%s)', 'Scheduled (%s)' ), + ) ); + + register_post_status( 'draft', array( + 'label' => _x( 'Draft', 'post' ), + 'protected' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop( 'Draft (%s)', 'Drafts (%s)' ), + ) ); + + register_post_status( 'pending', array( + 'label' => _x( 'Pending', 'post' ), + 'protected' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop( 'Pending (%s)', 'Pending (%s)' ), + ) ); + + register_post_status( 'private', array( + 'label' => _x( 'Private', 'post' ), + 'private' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop( 'Private (%s)', 'Private (%s)' ), + ) ); + + register_post_status( 'trash', array( + 'label' => _x( 'Trash', 'post' ), + 'internal' => true, + '_builtin' => true, /* internal use only. */ + 'label_count' => _n_noop( 'Trash (%s)', 'Trash (%s)' ), + 'show_in_admin_status_list' => true, + ) ); + + register_post_status( 'auto-draft', array( + 'label' => 'auto-draft', + 'internal' => true, + '_builtin' => true, /* internal use only. */ + ) ); + + register_post_status( 'inherit', array( + 'label' => 'inherit', + 'internal' => true, + '_builtin' => true, /* internal use only. */ + 'exclude_from_search' => false, + ) ); } add_action( 'init', 'create_initial_post_types', 0 ); // highest priority @@ -37,7 +153,7 @@ add_action( 'init', 'create_initial_post_types', 0 ); // highest priority * @uses apply_filters() Calls 'get_attached_file' on file path and attachment ID. * * @param int $attachment_id Attachment ID. - * @param bool $unfiltered Whether to apply filters or not. + * @param bool $unfiltered Whether to apply filters. * @return string The file path to the attached file. */ function get_attached_file( $attachment_id, $unfiltered = false ) { @@ -78,7 +194,7 @@ function update_attached_file( $attachment_id, $file ) { * * The path is relative to the current upload dir. * - * @since 2.9 + * @since 2.9.0 * @uses apply_filters() Calls '_wp_relative_upload_path' on file path. * * @param string $path Full path to the file @@ -253,10 +369,13 @@ function &get_post(&$post, $output = OBJECT, $filter = 'raw') { wp_cache_add($post->ID, $_post, 'posts'); } else { if ( is_object($post) ) - $post = $post->ID; - $post = (int) $post; - if ( ! $_post = wp_cache_get($post, 'posts') ) { - $_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post)); + $post_id = $post->ID; + else + $post_id = $post; + + $post_id = (int) $post_id; + if ( ! $_post = wp_cache_get($post_id, 'posts') ) { + $_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id)); if ( ! $_post ) return $null; _get_post_ancestors($_post); @@ -365,14 +484,17 @@ function get_post_mime_type($ID = '') { function get_post_status($ID = '') { $post = get_post($ID); - if ( is_object($post) ) { - if ( ('attachment' == $post->post_type) && $post->post_parent && ($post->ID != $post->post_parent) ) - return get_post_status($post->post_parent); - else - return $post->post_status; - } + if ( !is_object($post) ) + return false; - return false; + // Unattached attachments are assumed to be published. + if ( ('attachment' == $post->post_type) && ('inherit' == $post->post_status) && ( 0 == $post->post_parent) ) + return 'publish'; + + if ( ('attachment' == $post->post_type) && $post->post_parent && ($post->ID != $post->post_parent) ) + return get_post_status($post->post_parent); + + return $post->post_status; } /** @@ -416,31 +538,207 @@ function get_page_statuses( ) { return $status; } +/** + * Register a post type. Do not use before init. + * + * A simple function for creating or modifying a post status based on the + * parameters given. The function will accept an array (second optional + * parameter), along with a string for the post status name. + * + * + * Optional $args contents: + * + * label - A descriptive name for the post status marked for translation. Defaults to $post_status. + * public - Whether posts of this status should be shown in the admin UI. Defaults to true. + * exclude_from_search - Whether to exclude posts with this post status from search results. Defaults to true. + * + * @package WordPress + * @subpackage Post + * @since 3.0.0 + * @uses $wp_post_statuses Inserts new post status object into the list + * + * @param string $post_status Name of the post status. + * @param array|string $args See above description. + */ +function register_post_status($post_status, $args = array()) { + global $wp_post_statuses; + + if (!is_array($wp_post_statuses)) + $wp_post_statuses = array(); + + // Args prefixed with an underscore are reserved for internal use. + $defaults = array('label' => false, 'label_count' => false, 'exclude_from_search' => null, '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'capability_type' => 'post', 'hierarchical' => false, 'public' => null, 'internal' => null, 'protected' => null, 'private' => null, 'show_in_admin_all' => null, 'publicly_queryable' => null, 'show_in_admin_status_list' => null, 'show_in_admin_all_list' => null, 'single_view_cap' => null); + $args = wp_parse_args($args, $defaults); + $args = (object) $args; + + $post_status = sanitize_user($post_status, true); + $args->name = $post_status; + + if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private ) + $args->internal = true; + + if ( null === $args->public ) + $args->public = false; + + if ( null === $args->private ) + $args->private = false; + + if ( null === $args->protected ) + $args->protected = false; + + if ( null === $args->internal ) + $args->internal = false; + + if ( null === $args->publicly_queryable ) + $args->publicly_queryable = $args->public; + + if ( null === $args->exclude_from_search ) + $args->exclude_from_search = $args->internal; + + if ( null === $args->show_in_admin_all_list ) + $args->show_in_admin_all_list = !$args->internal; + + if ( null === $args->show_in_admin_status_list ) + $args->show_in_admin_status_list = !$args->internal; + + if ( null === $args->single_view_cap ) + $args->single_view_cap = $args->public ? '' : 'edit'; + + if ( false === $args->label ) + $args->label = $post_status; + + if ( false === $args->label_count ) + $args->label_count = array( $args->label, $args->label ); + + $wp_post_statuses[$post_status] = $args; + + return $args; +} + +/** + * Retrieve a post status object by name + * + * @package WordPress + * @subpackage Post + * @since 3.0.0 + * @uses $wp_post_statuses + * @see register_post_status + * @see get_post_statuses + * + * @param string $post_type The name of a registered post status + * @return object A post status object + */ +function get_post_status_object( $post_status ) { + global $wp_post_statuses; + + if ( empty($wp_post_statuses[$post_status]) ) + return null; + + return $wp_post_statuses[$post_status]; +} + +/** + * Get a list of all registered post status objects. + * + * @package WordPress + * @subpackage Post + * @since 3.0.0 + * @uses $wp_post_statuses + * @see register_post_status + * @see get_post_status_object + * + * @param array|string $args An array of key => value arguments to match against the post status objects. + * @param string $output The type of output to return, either post status 'names' or 'objects'. 'names' is the default. + * @param string $operator The logical operation to perform. 'or' means only one element + * from the array needs to match; 'and' means all elements must match. The default is 'and'. + * @return array A list of post type names or objects + */ +function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) { + global $wp_post_statuses; + + $field = ('names' == $output) ? 'name' : false; + + return wp_filter_object_list($wp_post_statuses, $args, $operator, $field); +} + +/** + * Whether the post type is hierarchical. + * + * A false return value might also mean that the post type does not exist. + * + * @since 3.0.0 + * @see get_post_type_object + * + * @param string $post Post type name + * @return bool Whether post type is hierarchical. + */ +function is_post_type_hierarchical( $post_type ) { + if ( ! post_type_exists( $post_type ) ) + return false; + + $post_type = get_post_type_object( $post_type ); + return $post_type->hierarchical; +} + +/** + * Checks if a post type is registered. + * + * @since 3.0.0 + * @uses get_post_type_object() + * + * @param string Post type name + * @return bool Whether post type is registered. + */ +function post_type_exists( $post_type ) { + return (bool) get_post_type_object( $post_type ); +} + /** * Retrieve the post type of the current post or of a given post. * * @since 2.1.0 * - * @uses $wpdb - * @uses $posts The Loop post global + * @uses $post The Loop current post global * - * @param mixed $post Optional. Post object or post ID. + * @param mixed $the_post Optional. Post object or post ID. * @return bool|string post type or false on failure. */ -function get_post_type($post = false) { - global $posts; +function get_post_type( $the_post = false ) { + global $post; - if ( false === $post ) - $post = $posts[0]; - elseif ( (int) $post ) - $post = get_post($post, OBJECT); + if ( false === $the_post ) + $the_post = $post; + elseif ( is_numeric($the_post) ) + $the_post = get_post($the_post); - if ( is_object($post) ) - return $post->post_type; + if ( is_object($the_post) ) + return $the_post->post_type; return false; } +/** + * Retrieve a post type object by name + * + * @package WordPress + * @subpackage Post + * @since 3.0.0 + * @uses $wp_post_types + * @see register_post_type + * @see get_post_types + * + * @param string $post_type The name of a registered post type + * @return object A post type object + */ +function get_post_type_object( $post_type ) { + global $wp_post_types; + + if ( empty($wp_post_types[$post_type]) ) + return null; + + return $wp_post_types[$post_type]; +} + /** * Get a list of all registered post type objects. * @@ -449,36 +747,19 @@ function get_post_type($post = false) { * @since 2.9.0 * @uses $wp_post_types * @see register_post_type - * @see get_post_types * - * @param array|string $args An array of key => value arguments to match against the post types. - * Only post types having attributes that match all arguments are returned. + * @param array|string $args An array of key => value arguments to match against the post type objects. * @param string $output The type of output to return, either post type 'names' or 'objects'. 'names' is the default. + * @param string $operator The logical operation to perform. 'or' means only one element + * from the array needs to match; 'and' means all elements must match. The default is 'and'. * @return array A list of post type names or objects */ -function get_post_types( $args = array(), $output = 'names' ) { +function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) { global $wp_post_types; - $do_names = false; - if ( 'names' == $output ) - $do_names = true; - - $post_types = array(); - foreach ( (array) $wp_post_types as $post_type ) { - if ( empty($args) ) { - if ( $do_names ) - $post_types[] = $post_type->name; - else - $post_types[] = $post_type; - } elseif ( array_intersect_assoc((array) $post_type, $args) ) { - if ( $do_names ) - $post_types[] = $post_type->name; - else - $post_types[] = $post_type; - } - } + $field = ('names' == $output) ? 'name' : false; - return $post_types; + return wp_filter_object_list($wp_post_types, $args, $operator, $field); } /** @@ -491,28 +772,277 @@ function get_post_types( $args = array(), $output = 'names' ) { * * Optional $args contents: * - * exclude_from_search - Whether to exclude posts with this post type from search results. Defaults to true. + * - label - Name of the post type shown in the menu. Usually plural. If not set, labels['name'] will be used. + * - description - A short descriptive summary of what the post type is. Defaults to blank. + * - public - Whether posts of this type should be shown in the admin UI. Defaults to false. + * - exclude_from_search - Whether to exclude posts with this post type from search results. Defaults to true if the type is not public, false if the type is public. + * - publicly_queryable - Whether post_type queries can be performed from the front page. Defaults to whatever public is set as. + * - show_ui - Whether to generate a default UI for managing this post type. Defaults to true if the type is public, false if the type is not public. + * - menu_position - The position in the menu order the post type should appear. Defaults to the bottom. + * - menu_icon - The url to the icon to be used for this menu. Defaults to use the posts icon. + * - capability_type - The post type to use for checking read, edit, and delete capabilities. Defaults to "post". + * - capabilities - Array of capabilities for this post type. You can see accepted values in {@link get_post_type_capabilities()}. By default the capability_type is used to construct capabilities. + * - hierarchical - Whether the post type is hierarchical. Defaults to false. + * - supports - An alias for calling add_post_type_support() directly. See add_post_type_support() for Documentation. Defaults to none. + * - register_meta_box_cb - Provide a callback function that will be called when setting up the meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback. + * - taxonomies - An array of taxonomy identifiers that will be registered for the post type. Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or register_taxonomy_for_object_type(). + * - labels - An array of labels for this post type. You can see accepted values in {@link get_post_type_labels()}. By default post labels are used for non-hierarchical types and page labels for hierarchical ones. + * - permalink_epmask - The default rewrite endpoint bitmasks. + * - rewrite - false to prevent rewrite, or array('slug'=>$slug) to customize permastruct; default will use $post_type as slug. + * - query_var - false to prevent queries, or string to value of the query var to use for this post type + * - can_export - true allows this post type to be exported. + * - show_in_nav_menus - true makes this post type available for selection in navigation menus. + * - _builtin - true if this post type is a native or "built-in" post_type. THIS IS FOR INTERNAL USE ONLY! + * - _edit_link - URL segement to use for edit link of this post type. Set to 'post.php?post=%d'. THIS IS FOR INTERNAL USE ONLY! * - * @package WordPress - * @subpackage Post * @since 2.9.0 * @uses $wp_post_types Inserts new post type object into the list * * @param string $post_type Name of the post type. * @param array|string $args See above description. + * @return object the registered post type object */ function register_post_type($post_type, $args = array()) { - global $wp_post_types; + global $wp_post_types, $wp_rewrite, $wp; - if (!is_array($wp_post_types)) + if ( !is_array($wp_post_types) ) $wp_post_types = array(); - $defaults = array('exclude_from_search' => true); + // Args prefixed with an underscore are reserved for internal use. + $defaults = array( + 'labels' => array(), 'description' => '', 'publicly_queryable' => null, 'exclude_from_search' => null, + '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'capability_type' => 'post', 'capabilities' => array(), 'hierarchical' => false, + 'public' => false, 'rewrite' => true, 'query_var' => true, 'supports' => array(), 'register_meta_box_cb' => null, + 'taxonomies' => array(), 'show_ui' => null, 'menu_position' => null, 'menu_icon' => null, + 'permalink_epmask' => EP_PERMALINK, 'can_export' => true, 'show_in_nav_menus' => null + ); $args = wp_parse_args($args, $defaults); + $args = (object) $args; $post_type = sanitize_user($post_type, true); - $args['name'] = $post_type; - $wp_post_types[$post_type] = (object) $args; + $args->name = $post_type; + + // If not set, default to the setting for public. + if ( null === $args->publicly_queryable ) + $args->publicly_queryable = $args->public; + + // If not set, default to the setting for public. + if ( null === $args->show_ui ) + $args->show_ui = $args->public; + + // Whether to show this type in nav-menus.php. Defaults to the setting for public. + if ( null === $args->show_in_nav_menus ) + $args->show_in_nav_menus = $args->public; + + // If not set, default to true if not public, false if public. + if ( null === $args->exclude_from_search ) + $args->exclude_from_search = !$args->public; + + if ( empty($args->capability_type) ) + $args->capability_type = 'post'; + + $args->cap = get_post_type_capabilities( $args ); + unset($args->capabilities); + + if ( ! empty($args->supports) ) { + add_post_type_support($post_type, $args->supports); + unset($args->supports); + } else { + // Add default features + add_post_type_support($post_type, array('title', 'editor')); + } + + if ( false !== $args->query_var && !empty($wp) ) { + if ( true === $args->query_var ) + $args->query_var = $post_type; + $args->query_var = sanitize_title_with_dashes($args->query_var); + $wp->add_query_var($args->query_var); + } + + if ( false !== $args->rewrite && '' != get_option('permalink_structure') ) { + if ( !is_array($args->rewrite) ) + $args->rewrite = array(); + if ( !isset($args->rewrite['slug']) ) + $args->rewrite['slug'] = $post_type; + if ( !isset($args->rewrite['with_front']) ) + $args->rewrite['with_front'] = true; + if ( $args->hierarchical ) + $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); + else + $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); + $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask); + } + + if ( $args->register_meta_box_cb ) + add_action('add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1); + + $args->labels = get_post_type_labels( $args ); + $args->label = $args->labels->name; + + $wp_post_types[$post_type] = $args; + + add_action( 'future_' . $post_type, '_future_post_hook', 5, 2 ); + + foreach ( $args->taxonomies as $taxonomy ) { + register_taxonomy_for_object_type( $taxonomy, $post_type ); + } + + return $args; +} + +/** + * Builds an object with all post type capabilities out of a post type object + * + * Accepted keys of the capabilities array in the post type object: + * - edit_post - The meta capability that controls editing a particular object of this post type. Defaults to "edit_ . $capability_type" (edit_post). + * - edit_posts - The capability that controls editing objects of this post type as a class. Defaults to "edit_ . $capability_type . s" (edit_posts). + * - edit_others_posts - The capability that controls editing objects of this post type that are owned by other users. Defaults to "edit_others_ . $capability_type . s" (edit_others_posts). + * - publish_posts - The capability that controls publishing objects of this post type. Defaults to "publish_ . $capability_type . s" (publish_posts). + * - read_post - The meta capability that controls reading a particular object of this post type. Defaults to "read_ . $capability_type" (read_post). + * - read_private_posts - The capability that controls reading private posts. Defaults to "read_private . $capability_type . s" (read_private_posts). + * - delete_post - The meta capability that controls deleting a particular object of this post type. Defaults to "delete_ . $capability_type" (delete_post). + * + * @since 3.0.0 + * @param object $args + * @return object object with all the capabilities as member variables + */ +function get_post_type_capabilities( $args ) { + $defaults = array( + 'edit_post' => 'edit_' . $args->capability_type, + 'edit_posts' => 'edit_' . $args->capability_type . 's', + 'edit_others_posts' => 'edit_others_' . $args->capability_type . 's', + 'publish_posts' => 'publish_' . $args->capability_type . 's', + 'read_post' => 'read_' . $args->capability_type, + 'read_private_posts' => 'read_private_' . $args->capability_type . 's', + 'delete_post' => 'delete_' . $args->capability_type, + ); + $labels = array_merge( $defaults, $args->capabilities ); + return (object) $labels; +} + +/** + * Builds an object with all post type labels out of a post type object + * + * Accepted keys of the label array in the post type object: + * - name - general name for the post type, usually plural. The same and overriden by $post_type_object->label. Default is Posts/Pages + * - singular_name - name for one object of this post type. Default is Post/Page + * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: _x('Add New', 'product'); + * - add_new_item - Default is Add New Post/Add New Page + * - edit_item - Default is Edit Post/Edit Page + * - new_item - Default is New Post/New Page + * - view_item - Default is View Post/View Page + * - search_items - Default is Search Posts/Search Pages + * - not_found - Default is No posts found/No pages found + * - not_found_in_trash - Default is No posts found in Trash/No pages found in Trash + * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical ones the default is Parent Page: + * + * Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages.) + * + * @since 3.0.0 + * @param object $post_type_object + * @return object object with all the labels as member variables + */ +function get_post_type_labels( $post_type_object ) { + $nohier_vs_hier_defaults = array( + 'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ), + 'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ), + 'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ), + 'add_new_item' => array( __('Add New Post'), __('Add New Page') ), + 'edit_item' => array( __('Edit Post'), __('Edit Page') ), + 'new_item' => array( __('New Post'), __('New Page') ), + 'view_item' => array( __('View Post'), __('View Page') ), + 'search_items' => array( __('Search Posts'), __('Search Pages') ), + 'not_found' => array( __('No posts found'), __('No pages found') ), + 'not_found_in_trash' => array( __('No posts found in Trash'), __('No pages found in Trash') ), + 'parent_item_colon' => array( null, __('Parent Page:') ) + ); + return _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults ); +} + +/** + * Builds an object with custom-something object (post type, taxonomy) labels out of a custom-something object + * + * @access private + */ +function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) { + + if ( isset( $object->label ) && empty( $object->labels['name'] ) ) + $object->labels['name'] = $object->label; + + if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) + $object->labels['singular_name'] = $object->labels['name']; + + $defaults = array_map( create_function( '$x', $object->hierarchical? 'return $x[1];' : 'return $x[0];' ), $nohier_vs_hier_defaults ); + $labels = array_merge( $defaults, $object->labels ); + return (object)$labels; +} + +/** + * Register support of certain features for a post type. + * + * All features are directly associated with a functional area of the edit screen, such as the + * editor or a meta box: 'title', 'editor', 'comments', 'revisions', 'trackbacks', 'author', + * 'excerpt', 'page-attributes', 'thumbnail', and 'custom-fields'. + * + * Additionally, the 'revisions' feature dictates whether the post type will store revisions, + * and the 'comments' feature dicates whether the comments count will show on the edit screen. + * + * @since 3.0.0 + * @param string $post_type The post type for which to add the feature + * @param string|array $feature the feature being added, can be an array of feature strings or a single string + */ +function add_post_type_support( $post_type, $feature ) { + global $_wp_post_type_features; + + $features = (array) $feature; + foreach ($features as $feature) { + if ( func_num_args() == 2 ) + $_wp_post_type_features[$post_type][$feature] = true; + else + $_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 ); + } +} + +/** + * Remove support for a feature from a post type. + * + * @since 3.0.0 + * @param string $post_type The post type for which to remove the feature + * @param string $feature The feature being removed + */ +function remove_post_type_support( $post_type, $feature ) { + global $_wp_post_type_features; + + if ( !isset($_wp_post_type_features[$post_type]) ) + return; + + if ( isset($_wp_post_type_features[$post_type][$feature]) ) + unset($_wp_post_type_features[$post_type][$feature]); +} + +/** + * Checks a post type's support for a given feature + * + * @since 3.0.0 + * @param string $post_type The post type being checked + * @param string $feature the feature being checked + * @return boolean + */ + +function post_type_supports( $post_type, $feature ) { + global $_wp_post_type_features; + + if ( !isset( $_wp_post_type_features[$post_type][$feature] ) ) + return false; + + // If no args passed then no extra checks need be performed + if ( func_num_args() <= 2 ) + return true; + + // @todo Allow pluggable arg checking + //$args = array_slice( func_get_args(), 2 ); + + return true; } /** @@ -572,8 +1102,8 @@ function get_posts($args = null) { $defaults = array( 'numberposts' => 5, 'offset' => 0, 'category' => 0, 'orderby' => 'post_date', - 'order' => 'DESC', 'include' => '', - 'exclude' => '', 'meta_key' => '', + 'order' => 'DESC', 'include' => array(), + 'exclude' => array(), 'meta_key' => '', 'meta_value' =>'', 'post_type' => 'post', 'suppress_filters' => true ); @@ -586,11 +1116,11 @@ function get_posts($args = null) { if ( ! empty($r['category']) ) $r['cat'] = $r['category']; if ( ! empty($r['include']) ) { - $incposts = preg_split('/[\s,]+/',$r['include']); + $incposts = wp_parse_id_list( $r['include'] ); $r['posts_per_page'] = count($incposts); // only the number of posts included $r['post__in'] = $incposts; } elseif ( ! empty($r['exclude']) ) - $r['post__not_in'] = preg_split('/[\s,]+/',$r['exclude']); + $r['post__not_in'] = wp_parse_id_list( $r['exclude'] ); $r['caller_get_posts'] = true; @@ -802,7 +1332,7 @@ function get_post_custom_values( $key = '', $post_id = 0 ) { * @since 2.7.0 * * @param int $post_id Optional. Post ID. - * @return bool Whether post is sticky (true) or not sticky (false). + * @return bool Whether post is sticky. */ function is_sticky($post_id = null) { global $id; @@ -855,7 +1385,6 @@ function sanitize_post($post, $context = 'display') { $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context); $post['filter'] = $context; } - return $post; } @@ -891,6 +1420,13 @@ function sanitize_post_field($field, $value, $post_id, $context) { if ( in_array($field, $int_fields) ) $value = (int) $value; + // Fields which contain arrays of ints. + $array_int_fields = array( 'ancestors' ); + if ( in_array($field, $array_int_fields) ) { + $value = array_map( 'absint', $value); + return $value; + } + if ( 'raw' == $context ) return $value; @@ -1018,7 +1554,8 @@ function wp_count_posts( $type = 'post', $perm = '' ) { $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s"; if ( 'readable' == $perm && is_user_logged_in() ) { - if ( !current_user_can("read_private_{$type}s") ) { + $post_type_object = get_post_type_object($type); + if ( !current_user_can( $post_type_object->cap->read_private_posts ) ) { $cache_key .= '_' . $perm . '_' . $user->ID; $query .= " AND (post_status != 'private' OR ( post_author = '$user->ID' AND post_status = 'private' ))"; } @@ -1031,10 +1568,12 @@ function wp_count_posts( $type = 'post', $perm = '' ) { $count = $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A ); - $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0, 'trash' => 0 ); - foreach( (array) $count as $row_num => $row ) { + $stats = array(); + foreach ( get_post_stati() as $state ) + $stats[$state] = 0; + + foreach ( (array) $count as $row ) $stats[$row['post_status']] = $row['num_posts']; - } $stats = (object) $stats; wp_cache_set($cache_key, $stats, 'counts'); @@ -1115,9 +1654,10 @@ function wp_match_mime_types($wildcard_mime_types, $real_mime_types) { * @since 2.5.0 * * @param string|array $mime_types List of mime types or comma separated string of mime types. + * @param string $table_alias Optional. Specify a table alias, if needed. * @return string The SQL AND clause for mime searching. */ -function wp_post_mime_type_where($post_mime_types) { +function wp_post_mime_type_where($post_mime_types, $table_alias = '') { $where = ''; $wildcards = array('', '%', '%/%'); if ( is_string($post_mime_types) ) @@ -1145,9 +1685,9 @@ function wp_post_mime_type_where($post_mime_types) { return ''; if ( false !== strpos($mime_pattern, '%') ) - $wheres[] = "post_mime_type LIKE '$mime_pattern'"; + $wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'"; else - $wheres[] = "post_mime_type = '$mime_pattern'"; + $wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'"; } if ( !empty($wheres) ) $where = ' AND (' . join(' OR ', $wheres) . ') '; @@ -1155,18 +1695,22 @@ function wp_post_mime_type_where($post_mime_types) { } /** - * Removes a post, attachment, or page. + * Trashes or deletes a post or page. * - * When the post and page goes, everything that is tied to it is deleted also. + * When the post and page is permanently deleted, everything that is tied to it is deleted also. * This includes comments, post meta fields, and terms associated with the post. * + * The post or page is moved to trash instead of permanently deleted unless trash is + * disabled, item is already in the trash, or $force_delete is true. + * * @since 1.0.0 * @uses do_action() on 'delete_post' before deletion unless post type is 'attachment'. * @uses do_action() on 'deleted_post' after deletion unless post type is 'attachment'. * @uses wp_delete_attachment() if post type is 'attachment'. + * @uses wp_trash_post() if item should be trashed. * * @param int $postid Post ID. - * @param bool $force_delete Whether to bypass trash and force deletion + * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. * @return mixed False on failure */ function wp_delete_post( $postid = 0, $force_delete = false ) { @@ -1175,7 +1719,7 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) return $post; - if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS > 0 ) + if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS ) return wp_trash_post($postid); if ( $post->post_type == 'attachment' ) @@ -1223,8 +1767,8 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid )); if ( ! empty($comment_ids) ) { do_action( 'delete_comment', $comment_ids ); - $in_comment_ids = "'" . implode("', '", $comment_ids) . "'"; - $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_ID IN($in_comment_ids)" ); + foreach ( $comment_ids as $comment_id ) + wp_delete_comment( $comment_id, true ); do_action( 'deleted_comment', $comment_ids ); } @@ -1251,7 +1795,7 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { clean_post_cache($postid); } - wp_clear_scheduled_hook('publish_future_post', $postid); + wp_clear_scheduled_hook('publish_future_post', array( $postid ) ); do_action('deleted_post', $postid); @@ -1261,16 +1805,19 @@ function wp_delete_post( $postid = 0, $force_delete = false ) { /** * Moves a post or page to the Trash * + * If trash is disabled, the post or page is permanently deleted. + * * @since 2.9.0 * @uses do_action() on 'trash_post' before trashing * @uses do_action() on 'trashed_post' after trashing + * @uses wp_delete_post() if trash is disabled * * @param int $postid Post ID. * @return mixed False on failure */ function wp_trash_post($post_id = 0) { - if ( EMPTY_TRASH_DAYS == 0 ) - return wp_delete_post($post_id); + if ( !EMPTY_TRASH_DAYS ) + return wp_delete_post($post_id, true); if ( !$post = wp_get_single_post($post_id, ARRAY_A) ) return $post; @@ -1530,14 +2077,27 @@ function wp_get_single_post($postid = 0, $mode = OBJECT) { $post = get_post($postid, $mode); + if ( + ( OBJECT == $mode && empty( $post->ID ) ) || + ( OBJECT != $mode && empty( $post['ID'] ) ) + ) + return ( OBJECT == $mode ? null : array() ); + // Set categories and tags - if($mode == OBJECT) { - $post->post_category = wp_get_post_categories($postid); - $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names')); - } - else { - $post['post_category'] = wp_get_post_categories($postid); - $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names')); + if ( $mode == OBJECT ) { + $post->post_category = array(); + if ( is_object_in_taxonomy($post->post_type, 'category') ) + $post->post_category = wp_get_post_categories($postid); + $post->tags_input = array(); + if ( is_object_in_taxonomy($post->post_type, 'post_tag') ) + $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names')); + } else { + $post['post_category'] = array(); + if ( is_object_in_taxonomy($post['post_type'], 'category') ) + $post['post_category'] = wp_get_post_categories($postid); + $post['tags_input'] = array(); + if ( is_object_in_taxonomy($post['post_type'], 'post_tag') ) + $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names')); } return $post; @@ -1592,7 +2152,8 @@ function wp_insert_post($postarr = array(), $wp_error = false) { $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID, 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, 'menu_order' => 0, 'to_ping' => '', 'pinged' => '', 'post_password' => '', - 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0); + 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0, + 'post_content' => '', 'post_title' => ''); $postarr = wp_parse_args($postarr, $defaults); $postarr = sanitize_post($postarr, 'db'); @@ -1616,30 +2177,34 @@ function wp_insert_post($postarr = array(), $wp_error = false) { return 0; } - // Make sure we set a valid category + if ( empty($post_type) ) + $post_type = 'post'; + + if ( empty($post_status) ) + $post_status = 'draft'; + + if ( !empty($post_category) ) + $post_category = array_filter($post_category); // Filter out empty terms + + // Make sure we set a valid category. if ( empty($post_category) || 0 == count($post_category) || !is_array($post_category) ) { - $post_category = array(get_option('default_category')); + // 'post' requires at least one category. + if ( 'post' == $post_type && 'auto-draft' != $post_status ) + $post_category = array( get_option('default_category') ); + else + $post_category = array(); } - //Set the default tag list - if ( !isset($tags_input) ) - $tags_input = array(); - if ( empty($post_author) ) $post_author = $user_ID; - if ( empty($post_status) ) - $post_status = 'draft'; - - if ( empty($post_type) ) - $post_type = 'post'; - $post_ID = 0; // Get the post ID and GUID if ( $update ) { $post_ID = (int) $ID; $guid = get_post_field( 'guid', $post_ID ); + $post_before = get_post($post_ID); } // Don't allow contributors to set to set the post slug for pending review posts @@ -1648,8 +2213,8 @@ function wp_insert_post($postarr = array(), $wp_error = false) { // Create a valid post name. Drafts and pending posts are allowed to have an empty // post name. - if ( !isset($post_name) || empty($post_name) ) { - if ( !in_array( $post_status, array( 'draft', 'pending' ) ) ) + if ( empty($post_name) ) { + if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) $post_name = sanitize_title($post_title); else $post_name = ''; @@ -1662,7 +2227,7 @@ function wp_insert_post($postarr = array(), $wp_error = false) { $post_date = current_time('mysql'); if ( empty($post_date_gmt) || '0000-00-00 00:00:00' == $post_date_gmt ) { - if ( !in_array( $post_status, array( 'draft', 'pending' ) ) ) + if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) $post_date_gmt = get_gmt_from_date($post_date); else $post_date_gmt = '0000-00-00 00:00:00'; @@ -1680,6 +2245,10 @@ function wp_insert_post($postarr = array(), $wp_error = false) { $now = gmdate('Y-m-d H:i:59'); if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) $post_status = 'future'; + } elseif( 'future' == $post_status ) { + $now = gmdate('Y-m-d H:i:59'); + if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) + $post_status = 'publish'; } if ( empty($comment_status) ) { @@ -1711,7 +2280,7 @@ function wp_insert_post($postarr = array(), $wp_error = false) { } elseif ( !empty($post_parent) ) { $parent_post = get_post($post_parent); // Check for circular dependency - if ( $parent_post->post_parent == $post_ID ) + if ( isset( $parent_post->post_parent ) && $parent_post->post_parent == $post_ID ) $post_parent = 0; } } @@ -1732,7 +2301,7 @@ function wp_insert_post($postarr = array(), $wp_error = false) { $data = stripslashes_deep( $data ); $where = array( 'ID' => $post_ID ); - if ($update) { + if ( $update ) { do_action( 'pre_post_update', $post_ID ); if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) { if ( $wp_error ) @@ -1762,19 +2331,25 @@ function wp_insert_post($postarr = array(), $wp_error = false) { $where = array( 'ID' => $post_ID ); } - if ( empty($data['post_name']) && !in_array( $data['post_status'], array( 'draft', 'pending' ) ) ) { + if ( empty($data['post_name']) && !in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) { $data['post_name'] = sanitize_title($data['post_title'], $post_ID); $wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where ); } - wp_set_post_categories( $post_ID, $post_category ); - // old-style tags_input - if ( !empty($tags_input) ) + if ( is_object_in_taxonomy($post_type, 'category') ) + wp_set_post_categories( $post_ID, $post_category ); + + if ( isset( $tags_input ) && is_object_in_taxonomy($post_type, 'post_tag') ) wp_set_post_tags( $post_ID, $tags_input ); - // new-style support for all tag-like taxonomies + + // new-style support for all custom taxonomies if ( !empty($tax_input) ) { foreach ( $tax_input as $taxonomy => $tags ) { - wp_set_post_terms( $post_ID, $tags, $taxonomy ); + $taxonomy_obj = get_taxonomy($taxonomy); + if ( is_array($tags) ) // array = hierarchical, string = non-hierarchical. + $tags = array_filter($tags); + if ( current_user_can($taxonomy_obj->cap->assign_terms) ) + wp_set_post_terms( $post_ID, $tags, $taxonomy ); } } @@ -1805,8 +2380,11 @@ function wp_insert_post($postarr = array(), $wp_error = false) { wp_transition_post_status($data['post_status'], $previous_status, $post); - if ( $update) + if ( $update ) { do_action('edit_post', $post_ID, $post); + $post_after = get_post($post_ID); + do_action( 'post_updated', $post_ID, $post_after, $post_before); + } do_action('save_post', $post_ID, $post); do_action('wp_insert_post', $post_ID, $post); @@ -1846,7 +2424,7 @@ function wp_update_post($postarr = array()) { $post_cats = $post['post_category']; // Drafts shouldn't be assigned a date unless explicitly done so by the user - if ( in_array($post['post_status'], array('draft', 'pending')) && empty($postarr['edit_date']) && + if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) && ('0000-00-00 00:00:00' == $post['post_date_gmt']) ) $clear_date = true; else @@ -1895,7 +2473,7 @@ function wp_publish_post($post_id) { // Update counts for the post's terms. foreach ( (array) get_object_taxonomies('post') as $taxonomy ) { - $tt_ids = wp_get_object_terms($post_id, $taxonomy, 'fields=tt_ids'); + $tt_ids = wp_get_object_terms($post_id, $taxonomy, array('fields' => 'tt_ids')); wp_update_term_count($tt_ids, $taxonomy); } @@ -1928,7 +2506,7 @@ function check_and_publish_future_post($post_id) { $time = strtotime( $post->post_date_gmt . ' GMT' ); if ( $time > time() ) { // Uh oh, someone jumped the gun! - wp_clear_scheduled_hook( 'publish_future_post', $post_id ); // clear anything else in the system + wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) ); return; } @@ -1938,10 +2516,10 @@ function check_and_publish_future_post($post_id) { /** - * Given the desired slug and some post details computes a unique slug for the post. + * Computes a unique slug for the post, when given the desired slug and some post details. * - * @global wpdb $wpdb - * @global WP_Rewrite $wp_rewrite + * @global wpdb $wpdb + * @global WP_Rewrite $wp_rewrite * @param string $slug the desired slug (post_name) * @param integer $post_ID * @param string $post_status no uniqueness checks are made if the post is still draft or pending @@ -1949,58 +2527,58 @@ function check_and_publish_future_post($post_id) { * @param integer $post_parent * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix) */ -function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) { - if ( in_array( $post_status, array( 'draft', 'pending' ) ) ) +function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) { + if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) return $slug; global $wpdb, $wp_rewrite; $feeds = $wp_rewrite->feeds; - if ( !is_array($feeds) ) + if ( ! is_array( $feeds ) ) $feeds = array(); - $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page')); + $hierarchical_post_types = get_post_types( array('hierarchical' => true) ); if ( 'attachment' == $post_type ) { // Attachment slugs must be unique across all types. $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID)); + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) ); - if ( $post_name_check || in_array($slug, $feeds) ) { + if ( $post_name_check || in_array( $slug, $feeds ) ) { $suffix = 2; do { - $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID)); + $alt_post_name = substr ($slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; + $post_name_check = $wpdb->get_var( $wpdb->prepare($check_sql, $alt_post_name, $post_ID ) ); $suffix++; - } while ($post_name_check); + } while ( $post_name_check ); $slug = $alt_post_name; } - } elseif ( in_array($post_type, $hierarchical_post_types) ) { - // Page slugs must be unique within their own trees. Pages are in a - // separate namespace than posts so page slugs are allowed to overlap post slugs. - $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", esc_sql($hierarchical_post_types)) . "' ) AND ID != %d AND post_parent = %d LIMIT 1"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent)); + } elseif ( in_array( $post_type, $hierarchical_post_types ) ) { + // Page slugs must be unique within their own trees. Pages are in a separate + // namespace than posts so page slugs are allowed to overlap post slugs. + $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode( "', '", esc_sql( $hierarchical_post_types ) ) . "' ) AND ID != %d AND post_parent = %d LIMIT 1"; + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) ); - if ( $post_name_check || in_array($slug, $feeds) ) { + if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( '@^(page)?\d+$@', $slug ) ) { $suffix = 2; do { - $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID, $post_parent)); + $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) ); $suffix++; - } while ($post_name_check); + } while ( $post_name_check ); $slug = $alt_post_name; } } else { // Post slugs must be unique across all posts. $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID)); + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) ); - if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) { + if ( $post_name_check || in_array( $slug, $feeds ) ) { $suffix = 2; do { - $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix"; - $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID)); + $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; + $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) ); $suffix++; - } while ($post_name_check); + } while ( $post_name_check ); $slug = $alt_post_name; } } @@ -2062,6 +2640,14 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a $tags = array(); $tags = is_array($tags) ? $tags : explode( ',', trim($tags, " \n\t\r\0\x0B,") ); + + // Hierarchical taxonomies must always pass IDs rather than names so that children with the same + // names but different parents aren't confused. + if ( is_taxonomy_hierarchical( $taxonomy ) ) { + $tags = array_map( 'intval', $tags ); + $tags = array_unique( $tags ); + } + wp_set_object_terms($post_id, $tags, $taxonomy, $append); } @@ -2079,14 +2665,22 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a */ function wp_set_post_categories($post_ID = 0, $post_categories = array()) { $post_ID = (int) $post_ID; + $post_type = get_post_type( $post_ID ); + $post_status = get_post_status( $post_ID ); // If $post_categories isn't already an array, make it one: - if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories)) - $post_categories = array(get_option('default_category')); - else if ( 1 == count($post_categories) && '' == $post_categories[0] ) + if ( !is_array($post_categories) || empty($post_categories) ) { + if ( 'post' == $post_type && 'auto-draft' != $post_status ) + $post_categories = array( get_option('default_category') ); + else + $post_categories = array(); + } else if ( 1 == count($post_categories) && '' == reset($post_categories) ) { return true; + } - $post_categories = array_map('intval', $post_categories); - $post_categories = array_unique($post_categories); + if ( !empty($post_categories) ) { + $post_categories = array_map('intval', $post_categories); + $post_categories = array_unique($post_categories); + } return wp_set_object_terms($post_ID, $post_categories, 'category'); } @@ -2278,17 +2872,8 @@ function get_all_page_ids() { * @return mixed Page data. */ function &get_page(&$page, $output = OBJECT, $filter = 'raw') { - if ( empty($page) ) { - if ( isset( $GLOBALS['post'] ) && isset( $GLOBALS['post']->ID ) ) { - return get_post($GLOBALS['post'], $output, $filter); - } else { - $page = null; - return $page; - } - } - - $the_page = get_post($page, $output, $filter); - return $the_page; + $p = get_post($page, $output, $filter); + return $p; } /** @@ -2298,10 +2883,11 @@ function &get_page(&$page, $output = OBJECT, $filter = 'raw') { * @uses $wpdb * * @param string $page_path Page path - * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. + * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. Default OBJECT. + * @param string $post_type Optional. Post type. Default page. * @return mixed Null when complete. */ -function get_page_by_path($page_path, $output = OBJECT) { +function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') { global $wpdb; $page_path = rawurlencode(urldecode($page_path)); $page_path = str_replace('%2F', '/', $page_path); @@ -2310,24 +2896,24 @@ function get_page_by_path($page_path, $output = OBJECT) { $leaf_path = sanitize_title(basename($page_paths)); $page_paths = explode('/', $page_paths); $full_path = ''; - foreach( (array) $page_paths as $pathdir) - $full_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir); + foreach ( (array) $page_paths as $pathdir ) + $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir); - $pages = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = %s AND (post_type = 'page' OR post_type = 'attachment')", $leaf_path )); + $pages = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = %s AND (post_type = %s OR post_type = 'attachment')", $leaf_path, $post_type )); if ( empty($pages) ) return null; - foreach ($pages as $page) { + foreach ( $pages as $page ) { $path = '/' . $leaf_path; $curpage = $page; - while ($curpage->post_parent != 0) { - $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type='page'", $curpage->post_parent )); + while ( $curpage->post_parent != 0 ) { + $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $curpage->post_parent, $post_type )); $path = '/' . $curpage->post_name . $path; } if ( $path == $full_path ) - return get_page($page->ID, $output); + return get_page($page->ID, $output, $post_type); } return null; @@ -2340,12 +2926,13 @@ function get_page_by_path($page_path, $output = OBJECT) { * @uses $wpdb * * @param string $page_title Page title - * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. + * @param string $output Optional. Output type. OBJECT, ARRAY_N, or ARRAY_A. Default OBJECT. + * @param string $post_type Optional. Post type. Default page. * @return mixed */ -function get_page_by_title($page_title, $output = OBJECT) { +function get_page_by_title($page_title, $output = OBJECT, $post_type = 'page' ) { global $wpdb; - $page = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title = %s AND post_type='page'", $page_title )); + $page = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title = %s AND post_type= %s", $page_title, $post_type ) ); if ( $page ) return get_page($page, $output); @@ -2392,8 +2979,8 @@ function &get_page_children($page_id, $pages) { function &get_page_hierarchy( &$pages, $page_id = 0 ) { if ( empty( $pages ) ) { - $return = array(); - return $return; + $result = array(); + return $result; } $children = array(); @@ -2433,11 +3020,12 @@ function _page_traverse_name( $page_id, &$children, &$result ){ * * @since 1.5.0 * - * @param int $page_id Page ID. + * @param mixed $page Page object or page ID. * @return string Page URI. */ -function get_page_uri($page_id) { - $page = get_page($page_id); +function get_page_uri($page) { + if ( ! is_object($page) ) + $page = get_page($page); $uri = $page->post_name; // A page cannot be it's own parent. @@ -2471,10 +3059,11 @@ function &get_pages($args = '') { $defaults = array( 'child_of' => 0, 'sort_order' => 'ASC', 'sort_column' => 'post_title', 'hierarchical' => 1, - 'exclude' => '', 'include' => '', + 'exclude' => array(), 'include' => array(), 'meta_key' => '', 'meta_value' => '', 'authors' => '', 'parent' => -1, 'exclude_tree' => '', - 'number' => '', 'offset' => 0 + 'number' => '', 'offset' => 0, + 'post_type' => 'page', 'post_status' => 'publish', ); $r = wp_parse_args( $args, $defaults ); @@ -2482,6 +3071,15 @@ function &get_pages($args = '') { $number = (int) $number; $offset = (int) $offset; + // Make sure the post type is hierarchical + $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) ); + if ( !in_array( $post_type, $hierarchical_post_types ) ) + return false; + + // Make sure we have a valid post status + if ( !in_array($post_status, get_post_stati()) ) + return false; + $cache = array(); $key = md5( serialize( compact(array_keys($defaults)) ) ); if ( $cache = wp_cache_get( 'get_pages', 'posts' ) ) { @@ -2502,8 +3100,8 @@ function &get_pages($args = '') { $meta_key = ''; $meta_value = ''; $hierarchical = false; - $incpages = preg_split('/[\s,]+/',$include); - if ( count($incpages) ) { + $incpages = wp_parse_id_list( $include ); + if ( ! empty( $incpages ) ) { foreach ( $incpages as $incpage ) { if (empty($inclusions)) $inclusions = $wpdb->prepare(' AND ( ID = %d ', $incpage); @@ -2517,8 +3115,8 @@ function &get_pages($args = '') { $exclusions = ''; if ( !empty($exclude) ) { - $expages = preg_split('/[\s,]+/',$exclude); - if ( count($expages) ) { + $expages = wp_parse_id_list( $exclude ); + if ( ! empty( $expages ) ) { foreach ( $expages as $expage ) { if (empty($exclusions)) $exclusions = $wpdb->prepare(' AND ( ID <> %d ', $expage); @@ -2534,7 +3132,7 @@ function &get_pages($args = '') { if (!empty($authors)) { $post_authors = preg_split('/[\s,]+/',$authors); - if ( count($post_authors) ) { + if ( ! empty( $post_authors ) ) { foreach ( $post_authors as $post_author ) { //Do we have an author id or an author login? if ( 0 == intval($post_author) ) { @@ -2574,7 +3172,9 @@ function &get_pages($args = '') { if ( $parent >= 0 ) $where .= $wpdb->prepare(' AND post_parent = %d ', $parent); - $query = "SELECT * FROM $wpdb->posts $join WHERE (post_type = 'page' AND post_status = 'publish') $where "; + $where_post_type = $wpdb->prepare( "post_type = '%s' AND post_status = '%s'", $post_type, $post_status ); + + $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where "; $query .= $author_query; $query .= " ORDER BY " . $sort_column . " " . $sort_order ; @@ -2635,9 +3235,9 @@ function &get_pages($args = '') { * @return bool True on success, false on failure. */ function is_local_attachment($url) { - if (strpos($url, get_bloginfo('url')) === false) + if (strpos($url, home_url()) === false) return false; - if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false) + if (strpos($url, home_url('/?attachment_id=')) !== false) return true; if ( $id = url_to_postid($url) ) { $post = & get_post($id); @@ -2705,17 +3305,21 @@ function wp_insert_attachment($object, $file = false, $parent = 0) { // export array as variables extract($object, EXTR_SKIP); - // Make sure we set a valid category - if ( !isset($post_category) || 0 == count($post_category) || !is_array($post_category)) { - $post_category = array(get_option('default_category')); - } - if ( empty($post_author) ) $post_author = $user_ID; $post_type = 'attachment'; $post_status = 'inherit'; + // Make sure we set a valid category. + if ( !isset($post_category) || 0 == count($post_category) || !is_array($post_category) ) { + // 'post' requires at least one category. + if ( 'post' == $post_type ) + $post_category = array( get_option('default_category') ); + else + $post_category = array(); + } + // Are we updating or creating? if ( !empty($ID) ) { $update = true; @@ -2818,18 +3422,21 @@ function wp_insert_attachment($object, $file = false, $parent = 0) { } /** - * Delete an attachment. + * Trashes or deletes an attachment. + * + * When an attachment is permanently deleted, the file will also be removed. + * Deletion removes all post meta fields, taxonomy, comments, etc. associated + * with the attachment (except the main post). * - * Will remove the file also, when the attachment is removed. Removes all post - * meta fields, taxonomy, comments, etc associated with the attachment (except - * the main post). + * The attachment is moved to the trash instead of permanently deleted unless trash + * for media is disabled, item is already in the trash, or $force_delete is true. * * @since 2.0.0 * @uses $wpdb * @uses do_action() Calls 'delete_attachment' hook on Attachment ID. * * @param int $postid Attachment ID. - * @param bool $force_delete Whether to bypass trash and force deletion + * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false. * @return mixed False on failure. Post data on success. */ function wp_delete_attachment( $post_id, $force_delete = false ) { @@ -2851,6 +3458,9 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { $backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true ); $file = get_attached_file( $post_id ); + if ( is_multisite() ) + delete_transient( 'dirsize_cache' ); + do_action('delete_attachment', $post_id); wp_delete_object_term_relationships($post_id, array('category', 'post_tag')); @@ -2859,10 +3469,10 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key = '_thumbnail_id' AND meta_value = %d", $post_id )); $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id )); - if ( ! empty($comment_ids) ) { + if ( ! empty( $comment_ids ) ) { do_action( 'delete_comment', $comment_ids ); - $in_comment_ids = "'" . implode("', '", $comment_ids) . "'"; - $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_ID IN($in_comment_ids)" ); + foreach ( $comment_ids as $comment_id ) + wp_delete_comment( $comment_id, true ); do_action( 'deleted_comment', $comment_ids ); } @@ -2890,8 +3500,7 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { } // remove intermediate and backup images if there are any - $sizes = apply_filters('intermediate_image_sizes', array('thumbnail', 'medium', 'large')); - foreach ( $sizes as $size ) { + foreach ( get_intermediate_image_sizes() as $size ) { if ( $intermediate = image_get_intermediate_size($post_id, $size) ) { $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']); @ unlink( path_join($uploadpath['basedir'], $intermediate_file) ); @@ -2925,7 +3534,7 @@ function wp_delete_attachment( $post_id, $force_delete = false ) { * @param bool $unfiltered Optional, default is false. If true, filters are not run. * @return string|bool Attachment meta field. False on failure. */ -function wp_get_attachment_metadata( $post_id, $unfiltered = false ) { +function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) { $post_id = (int) $post_id; if ( !$post =& get_post( $post_id ) ) return false; @@ -2975,10 +3584,10 @@ function wp_get_attachment_url( $post_id = 0 ) { if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location - elseif ( false !== strpos($file, 'wp-content/uploads') ) - $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); - else - $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. + elseif ( false !== strpos($file, 'wp-content/uploads') ) + $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); + else + $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. } } @@ -3170,31 +3779,24 @@ function wp_mime_type_icon( $mime = 0 ) { * @param int $post_id Post ID. * @return int Same as $post_id */ -function wp_check_for_changed_slugs($post_id) { - if ( !isset($_POST['wp-old-slug']) || !strlen($_POST['wp-old-slug']) ) - return $post_id; - - $post = &get_post($post_id); +function wp_check_for_changed_slugs($post_id, $post, $post_before) { + // dont bother if it hasnt changed + if ( $post->post_name == $post_before->post_name ) + return; // we're only concerned with published posts if ( $post->post_status != 'publish' || $post->post_type != 'post' ) - return $post_id; - - // only bother if the slug has changed - if ( $post->post_name == $_POST['wp-old-slug'] ) - return $post_id; + return; $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug'); // if we haven't added this old slug before, add it now - if ( !count($old_slugs) || !in_array($_POST['wp-old-slug'], $old_slugs) ) - add_post_meta($post_id, '_wp_old_slug', $_POST['wp-old-slug']); + if ( !in_array($post_before->post_name, $old_slugs) ) + add_post_meta($post_id, '_wp_old_slug', $post_before->post_name); // if the new slug was used previously, delete it from the list if ( in_array($post->post_name, $old_slugs) ) delete_post_meta($post_id, '_wp_old_slug', $post->post_name); - - return $post_id; } /** @@ -3218,8 +3820,22 @@ function wp_check_for_changed_slugs($post_id) { * @return string SQL code that can be added to a where clause. */ function get_private_posts_cap_sql($post_type) { - global $user_ID; - $cap = ''; + return get_posts_by_author_sql($post_type, FALSE); +} + +/** + * Retrieve the post SQL based on capability, author, and type. + * + * See above for full description. + * + * @since 3.0.0 + * @param string $post_type currently only supports 'post' or 'page'. + * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term. + * @param int $post_author Optional. Query posts having a single author ID. + * @return string SQL WHERE code that can be added to a query. + */ +function get_posts_by_author_sql($post_type, $full = TRUE, $post_author = NULL) { + global $user_ID, $wpdb; // Private posts if ($post_type == 'post') { @@ -3229,24 +3845,40 @@ function get_private_posts_cap_sql($post_type) { $cap = 'read_private_pages'; // Dunno what it is, maybe plugins have their own post type? } else { + $cap = ''; $cap = apply_filters('pub_priv_sql_capability', $cap); if (empty($cap)) { // We don't know what it is, filters don't change anything, // so set the SQL up to return nothing. - return '1 = 0'; + return ' 1 = 0 '; + } + } + + if ($full) { + if (is_null($post_author)) { + $sql = $wpdb->prepare('WHERE post_type = %s AND ', $post_type); + } else { + $sql = $wpdb->prepare('WHERE post_author = %d AND post_type = %s AND ', $post_author, $post_type); } + } else { + $sql = ''; } - $sql = '(post_status = \'publish\''; + $sql .= "(post_status = 'publish'"; if (current_user_can($cap)) { // Does the user have the capability to view private posts? Guess so. - $sql .= ' OR post_status = \'private\''; + $sql .= " OR post_status = 'private'"; } elseif (is_user_logged_in()) { // Users can view their own private posts. - $sql .= ' OR post_status = \'private\' AND post_author = \'' . $user_ID . '\''; - } + $id = (int) $user_ID; + if (is_null($post_author) || !$full) { + $sql .= " OR post_status = 'private' AND post_author = $id"; + } elseif ($id == (int)$post_author) { + $sql .= " OR post_status = 'private'"; + } // else none + } // else none $sql .= ')'; @@ -3254,7 +3886,7 @@ function get_private_posts_cap_sql($post_type) { } /** - * Retrieve the date the the last post was published. + * Retrieve the date that the last post was published. * * The server timezone is the default and is the difference between GMT and * server time. The 'blog' value is the date when the last post was posted. The @@ -3306,34 +3938,38 @@ function get_lastpostdate($timezone = 'server') { * @uses $blog_id * @uses apply_filters() Calls 'get_lastpostmodified' filter * - * @global mixed $cache_lastpostmodified Stores the date the last post was modified - * * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'. * @return string The date the post was last modified. */ function get_lastpostmodified($timezone = 'server') { - global $cache_lastpostmodified, $wpdb, $blog_id; + global $wpdb; + $add_seconds_server = date('Z'); - if ( !isset($cache_lastpostmodified[$blog_id][$timezone]) ) { - switch(strtolower($timezone)) { - case 'gmt': - $lastpostmodified = $wpdb->get_var("SELECT post_modified_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); - break; - case 'blog': - $lastpostmodified = $wpdb->get_var("SELECT post_modified FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); - break; - case 'server': - $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); - break; - } - $lastpostdate = get_lastpostdate($timezone); - if ( $lastpostdate > $lastpostmodified ) { - $lastpostmodified = $lastpostdate; - } - $cache_lastpostmodified[$blog_id][$timezone] = $lastpostmodified; - } else { - $lastpostmodified = $cache_lastpostmodified[$blog_id][$timezone]; + $timezone = strtolower( $timezone ); + + $lastpostmodified = wp_cache_get( "lastpostmodified:$timezone", 'timeinfo' ); + if ( $lastpostmodified ) + return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone ); + + switch ( strtolower($timezone) ) { + case 'gmt': + $lastpostmodified = $wpdb->get_var("SELECT post_modified_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); + break; + case 'blog': + $lastpostmodified = $wpdb->get_var("SELECT post_modified FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); + break; + case 'server': + $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1"); + break; } + + $lastpostdate = get_lastpostdate($timezone); + if ( $lastpostdate > $lastpostmodified ) + $lastpostmodified = $lastpostdate; + + if ( $lastpostmodified ) + wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' ); + return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone ); } @@ -3396,6 +4032,9 @@ function clean_post_cache($id) { foreach( $children as $cid ) clean_post_cache( $cid ); } + + if ( is_multisite() ) + wp_cache_delete( $wpdb->blogid . '-' . $id, 'global-posts' ); } /** @@ -3449,8 +4088,11 @@ function clean_page_cache($id) { * @uses update_postmeta_cache() * * @param array $posts Array of Post objects + * @param string $post_type The post type of the posts in $posts. Default is 'post'. + * @param bool $update_term_cache Whether to update the term cache. Default is true. + * @param bool $update_meta_cache Whether to update the meta cache. Default is true. */ -function update_post_caches(&$posts) { +function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) { // No point in doing all this work if we didn't match any posts. if ( !$posts ) return; @@ -3458,13 +4100,17 @@ function update_post_caches(&$posts) { update_post_cache($posts); $post_ids = array(); + foreach ( $posts as $post ) + $post_ids[] = $post->ID; - for ($i = 0; $i < count($posts); $i++) - $post_ids[] = $posts[$i]->ID; + if ( empty($post_type) ) + $post_type = 'post'; - update_object_term_cache($post_ids, 'post'); + if ( !is_array($post_type) && 'any' != $post_type && $update_term_cache ) + update_object_term_cache($post_ids, $post_type); - update_postmeta_cache($post_ids); + if ( $update_meta_cache ) + update_postmeta_cache($post_ids); } /** @@ -3487,6 +4133,41 @@ function update_postmeta_cache($post_ids) { return update_meta_cache('post', $post_ids); } +/** + * Will clean the attachment in the cache. + * + * Cleaning means delete from the cache. Optionaly will clean the term + * object cache associated with the attachment ID. + * + * This function will not run if $_wp_suspend_cache_invalidation is not empty. See + * wp_suspend_cache_invalidation(). + * + * @package WordPress + * @subpackage Cache + * @since 3.0.0 + * + * @uses do_action() Calls 'clean_attachment_cache' on $id. + * + * @param int $id The attachment ID in the cache to clean + * @param bool $clean_terms optional. Whether to clean terms cache + */ +function clean_attachment_cache($id, $clean_terms = false) { + global $_wp_suspend_cache_invalidation; + + if ( !empty($_wp_suspend_cache_invalidation) ) + return; + + $id = (int) $id; + + wp_cache_delete($id, 'posts'); + wp_cache_delete($id, 'post_meta'); + + if ( $clean_terms ) + clean_object_term_cache($id, 'attachment'); + + do_action('clean_attachment_cache', $id); +} + // // Hooks // @@ -3514,8 +4195,15 @@ function _transition_post_status($new_status, $old_status, $post) { do_action('private_to_published', $post->ID); // Deprecated, use private_to_publish } + // If published posts changed clear the lastpostmodified cache + if ( 'publish' == $new_status || 'publish' == $old_status) { + wp_cache_delete( 'lastpostmodified:server', 'timeinfo' ); + wp_cache_delete( 'lastpostmodified:gmt', 'timeinfo' ); + wp_cache_delete( 'lastpostmodified:blog', 'timeinfo' ); + } + // Always clears the hook in case the post status bounced from future to draft. - wp_clear_scheduled_hook('publish_future_post', $post->ID); + wp_clear_scheduled_hook('publish_future_post', array( $post->ID ) ); } /** @@ -3526,12 +4214,14 @@ function _transition_post_status($new_status, $old_status, $post) { * @since 2.3.0 * @access private * - * @param int $deprecated Not Used. Can be set to null. + * @param int $deprecated Not used. Can be set to null. Never implemented. + * Not marked as deprecated with _deprecated_argument() as it conflicts with + * wp_transition_post_status() and the default filter for _future_post_hook(). * @param object $post Object type containing the post information */ -function _future_post_hook($deprecated = '', $post) { - wp_clear_scheduled_hook( 'publish_future_post', $post->ID ); - wp_schedule_single_event(strtotime($post->post_date_gmt. ' GMT'), 'publish_future_post', array($post->ID)); +function _future_post_hook( $deprecated = '', $post ) { + wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) ); + wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) ); } /** @@ -3711,13 +4401,13 @@ function wp_save_post_revision( $post_id ) { return; // WP_POST_REVISIONS = 0, false - if ( !constant('WP_POST_REVISIONS') ) + if ( ! WP_POST_REVISIONS ) return; if ( !$post = get_post( $post_id, ARRAY_A ) ) return; - if ( !in_array( $post['post_type'], array( 'post', 'page' ) ) ) + if ( !post_type_supports($post['post_type'], 'revisions') ) return; $return = _wp_put_post_revision( $post ); @@ -3729,7 +4419,7 @@ function wp_save_post_revision( $post_id ) { // all revisions and (possibly) one autosave $revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) ); - // WP_POST_REVISIONS = (int) (# of autasaves to save) + // WP_POST_REVISIONS = (int) (# of autosaves to save) $delete = count($revisions) - WP_POST_REVISIONS; if ( $delete < 1 ) @@ -3990,7 +4680,7 @@ function wp_delete_post_revision( $revision_id ) { * @return array empty if no revisions */ function wp_get_post_revisions( $post_id = 0, $args = null ) { - if ( !constant('WP_POST_REVISIONS') ) + if ( ! WP_POST_REVISIONS ) return array(); if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) ) return array();