Changes from branches/3.0/wp-includes/post.php at r16668 to trunk/wp-includes/post.php at r17429

File:

• trunk/wp-includes/post.php (modified) (83 diffs)

trunk/wp-includes/post.php

@@ -14 +14 @@
 /**
  * Creates the initial post types when 'init' action is fired.
+ *
+ * @since 2.9.0
  */
 function create_initial_post_types() {
@@ -21 +23 @@
         '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
         'capability_type' => 'post',
+        'map_meta_cap' => true,
         'hierarchical' => false,
         'rewrite' => false,
         'query_var' => false,
-        'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions' ),
+        'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
     ) );
 
@@ -32 +35 @@
         '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
         'capability_type' => 'page',
+        'map_meta_cap' => true,
         'hierarchical' => true,
         'rewrite' => false,
@@ -47 +51 @@
         '_edit_link' => 'media.php?attachment_id=%d', /* internal use only. don't use this when registering your own post type. */
         'capability_type' => 'post',
+        'map_meta_cap' => true,
         'hierarchical' => false,
         'rewrite' => false,
         'query_var' => false,
-        'can_export' => false,
         'show_in_nav_menus' => false,
     ) );
@@ -63 +67 @@
         '_edit_link' => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */
         'capability_type' => 'post',
+        'map_meta_cap' => true,
         'hierarchical' => false,
         'rewrite' => false,
         'query_var' => false,
+        'can_export' => false,
     ) );
 
@@ -75 +81 @@
         'public' => false,
         '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-        'capability_type' => 'post',
         'hierarchical' => false,
         'rewrite' => false,
@@ -262 +267 @@
  * @return array|bool False on failure and the type will be determined by $output parameter.
  */
-function &get_children($args = '', $output = OBJECT) {
+function get_children($args = '', $output = OBJECT) {
     $kids = array();
     if ( empty( $args ) ) {
@@ -291 +296 @@
 
     foreach ( $children as $key => $child )
-        $kids[$child->ID] =& $children[$key];
+        $kids[$child->ID] = $children[$key];
 
     if ( $output == OBJECT ) {
@@ -472 +477 @@
 
 /**
+ * Retrieve the format slug for a post
+ *
+ * @since 3.1.0
+ *
+ * @param int|object $post A post
+ *
+ * @return mixed The format if successful. False if no format is set.  WP_Error if errors.
+ */
+function get_post_format( $post = null ) {
+    $post = get_post($post);
+
+    if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+        return false;
+
+    $_format = get_the_terms( $post->ID, 'post_format' );
+
+    if ( empty( $_format ) )
+        return false;
+
+    $format = array_shift( $_format );
+
+    return ( str_replace('post-format-', '', $format->slug ) );
+}
+
+/**
+ * Check if a post has a particular format
+ *
+ * @since 3.1.0
+ * @uses has_term()
+ *
+ * @param string $format The format to check for
+ * @param object|id $post The post to check. If not supplied, defaults to the current post if used in the loop.
+ * @return bool True if the post has the format, false otherwise.
+ */
+function has_post_format( $format, $post = null ) {
+    return has_term('post-format-' . sanitize_key($format), 'post_format', $post);
+}
+
+/**
+ * Assign a format to a post
+ *
+ * @since 3.1.0
+ *
+ * @param int|object $post The post for which to assign a format
+ * @param string $format  A format to assign.  Use an empty string or array to remove all formats from the post.
+ * @return mixed WP_Error on error. Array of affected term IDs on success.
+ */
+function set_post_format( $post, $format ) {
+    $post = get_post($post);
+
+    if ( empty($post) )
+        return new WP_Error('invalid_post', __('Invalid post'));
+
+    if ( !empty($format) ) {
+        $format = sanitize_key($format);
+        if ( 'standard' == $format || !in_array( $format, array_keys( get_post_format_slugs() ) ) )
+            $format = '';
+        else
+            $format = 'post-format-' . $format;
+    }
+
+    return wp_set_post_terms($post->ID, $format, 'post_format');
+}
+
+/**
  * Retrieve the post status based on the Post ID.
  *
@@ -550 +620 @@
  *
  * 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.
+ * public - Whether posts of this status should be shown in the front end of the site. Defaults to true.
  * exclude_from_search - Whether to exclude posts with this post status from search results. Defaults to true.
+ * show_in_admin_all_list - Whether to include posts in the edit listing for their post type
+ * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit
+ *                             listings, e.g. All (12) | Published (9) | My Custom Status (2) ...
+ *
+ * Arguments prefixed with an _underscore shouldn't be used by plugins and themes.
  *
  * @package WordPress
@@ -572 +647 @@
     $args = (object) $args;
 
-    $post_status = sanitize_user($post_status, true);
+    $post_status = sanitize_key($post_status);
     $args->name = $post_status;
 
@@ -626 +701 @@
  * @see get_post_statuses
  *
- * @param string $post_type The name of a registered post status
+ * @param string $post_status The name of a registered post status
  * @return object A post status object
  */
@@ -670 +745 @@
  * @see get_post_type_object
  *
- * @param string $post Post type name
+ * @param string $post_type Post type name
  * @return bool Whether post type is hierarchical.
  */
@@ -687 +762 @@
  * @uses get_post_type_object()
  *
- * @param string Post type name
+ * @param string $post_type Post type name
  * @return bool Whether post type is registered.
  */
@@ -766 +841 @@
  * Register a post type. Do not use before init.
  *
- * A simple function for creating or modifying a post type based on the
+ * A function for creating or modifying a post type based on the
  * parameters given. The function will accept an array (second optional
  * parameter), along with a string for the post type name.
- *
  *
  * Optional $args contents:
@@ -776 +850 @@
  * - 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.
+ * - 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.
+ * - show_in_menu - Where to show the post type in the admin menu. True for a top level menu,
+ *     false for no menu, or can be a top level page like 'tools.php' or 'edit.php?post_type=page'.
+ *     show_ui must be true.
  * - 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.
+ * - capability_type - The string to use to build the read, edit, and delete capabilities. Defaults to 'post'.
+ *   May be passed as an array to allow for alternative plurals when using this argument as a base to construct the
+ *   capabilities, e.g. array('story', 'stories').
+ * - capabilities - Array of capabilities for this post type. By default the capability_type is used
+ *      as a base to construct capabilities. You can see accepted values in {@link get_post_type_capabilities()}.
+ * - map_meta_cap - Whether to use the internal default meta capability handling. Defaults to false.
  * - 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.
+ * - supports - An alias for calling add_post_type_support() directly. See {@link 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. By default post labels are used for non-hierarchical
+ *     types and page labels for hierarchical ones. You can see accepted values in {@link get_post_type_labels()}.
  * - 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.
+ * - has_archive - True to enable post type archives. Will generate the proper rewrite rules if rewrite is enabled.
+ * - rewrite - false to prevent rewrite. Defaults to true. Use array('slug'=>$slug) to customize permastruct;
+ *     default will use $post_type as slug. Other options include 'with_front', 'feeds', and 'pages'.
  * - 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!
+ * - _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. THIS IS FOR INTERNAL USE ONLY!
  *
  * @since 2.9.0
@@ -801 +892 @@
  * @param string $post_type Name of the post type.
  * @param array|string $args See above description.
- * @return object the registered post type object
+ * @return object|WP_Error the registered post type object, or an error object
  */
 function register_post_type($post_type, $args = array()) {
@@ -812 +903 @@
     $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,
+        'capability_type' => 'post', 'capabilities' => array(), 'map_meta_cap' => null,
+        '_builtin' => false, '_edit_link' => 'post.php?post=%d', 'hierarchical' => false,
+        'public' => false, 'rewrite' => true, 'has_archive' => false, '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
+        'permalink_epmask' => EP_PERMALINK, 'can_export' => true, 'show_in_nav_menus' => null, 'show_in_menu' => null,
     );
     $args = wp_parse_args($args, $defaults);
     $args = (object) $args;
 
-    $post_type = sanitize_user($post_type, true);
+    $post_type = sanitize_key($post_type);
     $args->name = $post_type;
+
+    if ( strlen( $post_type ) > 20 )
+            return new WP_Error( 'post_type_too_long', __( 'Post types cannot exceed 20 characters in length' ) );
 
     // If not set, default to the setting for public.
@@ -831 +927 @@
         $args->show_ui = $args->public;
 
+    // If not set, default to the setting for show_ui.
+    if ( null === $args->show_in_menu || ! $args->show_ui )
+        $args->show_in_menu = $args->show_ui;
+
     // Whether to show this type in nav-menus.php.  Defaults to the setting for public.
     if ( null === $args->show_in_nav_menus )
@@ -839 +939 @@
         $args->exclude_from_search = !$args->public;
 
-    if ( empty($args->capability_type) )
-        $args->capability_type = 'post';
+    // Back compat with quirky handling in version 3.0. #14122
+    if ( empty( $args->capabilities ) && null === $args->map_meta_cap && in_array( $args->capability_type, array( 'post', 'page' ) ) )
+        $args->map_meta_cap = true;
+
+    if ( null === $args->map_meta_cap )
+        $args->map_meta_cap = false;
 
     $args->cap = get_post_type_capabilities( $args );
     unset($args->capabilities);
+
+    if ( is_array( $args->capability_type ) )
+        $args->capability_type = $args->capability_type[0];
 
     if ( ! empty($args->supports) ) {
@@ -861 +968 @@
 
     if ( false !== $args->rewrite && '' != get_option('permalink_structure') ) {
-        if ( !is_array($args->rewrite) )
+        if ( ! is_array( $args->rewrite ) )
             $args->rewrite = array();
-        if ( !isset($args->rewrite['slug']) )
+        if ( empty( $args->rewrite['slug'] ) )
             $args->rewrite['slug'] = $post_type;
-        if ( !isset($args->rewrite['with_front']) )
+        if ( ! isset( $args->rewrite['with_front'] ) )
             $args->rewrite['with_front'] = true;
+        if ( ! isset( $args->rewrite['pages'] ) )
+            $args->rewrite['pages'] = true;
+        if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
+            $args->rewrite['feeds'] = (bool) $args->has_archive;
+
         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=");
+
+        if ( $args->has_archive ) {
+            $archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
+            $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
+            if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
+                $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
+                $wp_rewrite->add_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
+                $wp_rewrite->add_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
+            }
+            if ( $args->rewrite['pages'] )
+                $wp_rewrite->add_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
+        }
+
         $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);
     }
@@ -894 +1019 @@
  * 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).
- *
+ * Post type capabilities use the 'capability_type' argument as a base, if the
+ * capability is not set in the 'capabilities' argument array or if the
+ * 'capabilities' argument is not supplied.
+ *
+ * The capability_type argument can optionally be registered as an array, with
+ * the first value being singular and the second plural, e.g. array('story, 'stories')
+ * Otherwise, an 's' will be added to the value for the plural form. After
+ * registration, capability_type will always be a string of the singular value.
+ *
+ * By default, seven keys are accepted as part of the capabilities array:
+ *
+ * - edit_post, read_post, and delete_post are meta capabilities, which are then
+ *   generally mapped to corresponding primitive capabilities depending on the
+ *   context, which would be the post being edited/read/deleted and the user or
+ *   role being checked. Thus these capabilities would generally not be granted
+ *   directly to users or roles.
+ *
+ * - edit_posts - Controls whether objects of this post type can be edited.
+ * - edit_others_posts - Controls whether objects of this type owned by other users
+ *   can be edited. If the post type does not support an author, then this will
+ *   behave like edit_posts.
+ * - publish_posts - Controls publishing objects of this post type.
+ * - read_private_posts - Controls whether private objects can be read.
+
+ * These four primitive capabilities are checked in core in various locations.
+ * There are also seven other primitive capabilities which are not referenced
+ * directly in core, except in map_meta_cap(), which takes the three aforementioned
+ * meta capabilities and translates them into one or more primitive capabilities
+ * that must then be checked against the user or role, depending on the context.
+ *
+ * - read - Controls whether objects of this post type can be read.
+ * - delete_posts - Controls whether objects of this post type can be deleted.
+ * - delete_private_posts - Controls whether private objects can be deleted.
+ * - delete_published_posts - Controls whether published objects can be deleted.
+ * - delete_others_posts - Controls whether objects owned by other users can be
+ *   can be deleted. If the post type does not support an author, then this will
+ *   behave like delete_posts.
+ * - edit_private_posts - Controls whether private objects can be edited.
+ * - edit_published_posts - Controls whether published objects can be deleted.
+ *
+ * These additional capabilities are only used in map_meta_cap(). Thus, they are
+ * only assigned by default if the post type is registered with the 'map_meta_cap'
+ * argument set to true (default is false).
+ *
+ * @see map_meta_cap()
  * @since 3.0.0
- * @param object $args
+ *
+ * @param object $args Post type registration arguments
  * @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,
+    if ( ! is_array( $args->capability_type ) )
+        $args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+
+    // Singular base for meta capabilities, plural base for primitive capabilities.
+    list( $singular_base, $plural_base ) = $args->capability_type;
+
+    $default_capabilities = array(
+        // Meta capabilities
+        'edit_post'          => 'edit_'         . $singular_base,
+        'read_post'          => 'read_'         . $singular_base,
+        'delete_post'        => 'delete_'       . $singular_base,
+        // Primitive capabilities used outside of map_meta_cap():
+        'edit_posts'         => 'edit_'         . $plural_base,
+        'edit_others_posts'  => 'edit_others_'  . $plural_base,
+        'publish_posts'      => 'publish_'      . $plural_base,
+        'read_private_posts' => 'read_private_' . $plural_base,
     );
-    $labels = array_merge( $defaults, $args->capabilities );
-    return (object) $labels;
+
+    // Primitive capabilities used within map_meta_cap():
+    if ( $args->map_meta_cap ) {
+        $default_capabilities_for_mapping = array(
+            'read'                   => 'read',
+            'delete_posts'           => 'delete_'           . $plural_base,
+            'delete_private_posts'   => 'delete_private_'   . $plural_base,
+            'delete_published_posts' => 'delete_published_' . $plural_base,
+            'delete_others_posts'    => 'delete_others_'    . $plural_base,
+            'edit_private_posts'     => 'edit_private_'     . $plural_base,
+            'edit_published_posts'   => 'edit_published_'   . $plural_base,
+        );
+        $default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
+    }
+
+    $capabilities = array_merge( $default_capabilities, $args->capabilities );
+
+    // Remember meta capabilities for future reference.
+    if ( $args->map_meta_cap )
+        _post_type_meta_capabilities( $capabilities );
+
+    return (object) $capabilities;
+}
+
+/**
+ * Stores or returns a list of post type meta caps for map_meta_cap().
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _post_type_meta_capabilities( $capabilities = null ) {
+    static $meta_caps = array();
+    if ( null === $capabilities )
+        return $meta_caps;
+    foreach ( $capabilities as $core => $custom ) {
+        if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) )
+            $meta_caps[ $custom ] = $core;
+    }
 }
 
@@ -937 +1143 @@
  * - 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.)
+ * 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
@@ -953 +1159 @@
         '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:') )
+        '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:') ),
     );
+    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
     return _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
 }
@@ -964 +1171 @@
  *
  * @access private
+ * @since 3.0.0
  */
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
@@ -973 +1181 @@
         $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 );
+    if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
+        $object->labels['menu_name'] = $object->labels['name'];
+
+    foreach ( $nohier_vs_hier_defaults as $key => $value )
+            $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
+
     $labels = array_merge( $defaults, $object->labels );
     return (object)$labels;
 }
+
+/**
+ * Adds submenus for post types.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _add_post_type_submenus() {
+    foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
+        $ptype_obj = get_post_type_object( $ptype );
+        // Submenus only.
+        if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
+            continue;
+        add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
+    }
+}
+add_action( 'admin_menu', '_add_post_type_submenus' );
 
 /**
@@ -1112 +1342 @@
     if ( empty( $r['post_status'] ) )
         $r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-    if ( ! empty($r['numberposts']) )
+    if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
         $r['posts_per_page'] = $r['numberposts'];
     if ( ! empty($r['category']) )
@@ -1123 +1353 @@
         $r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
 
-    $r['caller_get_posts'] = true;
+    $r['ignore_sticky_posts'] = true;
+    $r['no_found_rows'] = true;
 
     $get_posts = new WP_Query;
@@ -1144 +1375 @@
  *
  * @param int $post_id Post ID.
- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
  * @param bool $unique Optional, default is false. Whether the same key should not be added.
  * @return bool False for failure. True for success.
@@ -1206 +1437 @@
  * If the meta field for the post does not exist, it will be added.
  *
- * @since 1.5
+ * @since 1.5.0
  * @uses $wpdb
  * @link http://codex.wordpress.org/Function_Reference/update_post_meta
  *
  * @param int $post_id Post ID.
- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
  * @param mixed $prev_value Optional. Previous value to check before removing.
  * @return bool False on failure, true if success.
@@ -1267 +1498 @@
  * @return array
  */
-function get_post_custom($post_id = 0) {
-    global $id;
-
-    if ( !$post_id )
-        $post_id = (int) $id;
-
-    $post_id = (int) $post_id;
-
-    if ( ! wp_cache_get($post_id, 'post_meta') )
-        update_postmeta_cache($post_id);
-
-    return wp_cache_get($post_id, 'post_meta');
+function get_post_custom( $post_id = 0 ) {
+    $post_id = absint( $post_id );
+
+    if ( ! $post_id )
+        $post_id = get_the_ID();
+
+    if ( ! wp_cache_get( $post_id, 'post_meta' ) )
+        update_postmeta_cache( $post_id );
+
+    return wp_cache_get( $post_id, 'post_meta' );
 }
 
@@ -1335 +1564 @@
  * @return bool Whether post is sticky.
  */
-function is_sticky($post_id = null) {
-    global $id;
-
-    $post_id = absint($post_id);
-
-    if ( !$post_id )
-        $post_id = absint($id);
-
-    $stickies = get_option('sticky_posts');
-
-    if ( !is_array($stickies) )
+function is_sticky( $post_id = 0 ) {
+    $post_id = absint( $post_id );
+
+    if ( ! $post_id )
+        $post_id = get_the_ID();
+
+    $stickies = get_option( 'sticky_posts' );
+
+    if ( ! is_array( $stickies ) )
         return false;
 
-    if ( in_array($post_id, $stickies) )
+    if ( in_array( $post_id, $stickies ) )
         return true;
 
@@ -1397 +1624 @@
  *
  * @since 2.3.0
- * @uses apply_filters() Calls 'edit_$field' and '${field_no_prefix}_edit_pre' passing $value and
+ * @uses apply_filters() Calls 'edit_$field' and '{$field_no_prefix}_edit_pre' passing $value and
  *  $post_id if $context == 'edit' and field name prefix == 'post_'.
  *
  * @uses apply_filters() Calls 'edit_post_$field' passing $value and $post_id if $context == 'db'.
  * @uses apply_filters() Calls 'pre_$field' passing $value if $context == 'db' and field name prefix == 'post_'.
- * @uses apply_filters() Calls '${field}_pre' passing $value if $context == 'db' and field name prefix != 'post_'.
+ * @uses apply_filters() Calls '{$field}_pre' passing $value if $context == 'db' and field name prefix != 'post_'.
  *
  * @uses apply_filters() Calls '$field' passing $value, $post_id and $context if $context == anything
@@ -1441 +1668 @@
 
         if ( $prefixed ) {
-            $value = apply_filters("edit_$field", $value, $post_id);
+            $value = apply_filters("edit_{$field}", $value, $post_id);
             // Old school
-            $value = apply_filters("${field_no_prefix}_edit_pre", $value, $post_id);
+            $value = apply_filters("{$field_no_prefix}_edit_pre", $value, $post_id);
         } else {
-            $value = apply_filters("edit_post_$field", $value, $post_id);
+            $value = apply_filters("edit_post_{$field}", $value, $post_id);
         }
 
@@ -1458 +1685 @@
     } else if ( 'db' == $context ) {
         if ( $prefixed ) {
-            $value = apply_filters("pre_$field", $value);
-            $value = apply_filters("${field_no_prefix}_save_pre", $value);
+            $value = apply_filters("pre_{$field}", $value);
+            $value = apply_filters("{$field_no_prefix}_save_pre", $value);
         } else {
-            $value = apply_filters("pre_post_$field", $value);
-            $value = apply_filters("${field}_pre", $value);
+            $value = apply_filters("pre_post_{$field}", $value);
+            $value = apply_filters("{$field}_pre", $value);
         }
     } else {
@@ -1469 +1696 @@
             $value = apply_filters($field, $value, $post_id, $context);
         else
-            $value = apply_filters("post_$field", $value, $post_id, $context);
+            $value = apply_filters("post_{$field}", $value, $post_id, $context);
     }
 
@@ -1654 +1881 @@
  * @since 2.5.0
  *
- * @param string|array $mime_types List of mime types or comma separated string of mime types.
+ * @param string|array $post_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.
@@ -1813 +2040 @@
  * @uses wp_delete_post() if trash is disabled
  *
- * @param int $postid Post ID.
+ * @param int $post_id Post ID.
  * @return mixed False on failure
  */
@@ -1848 +2075 @@
  * @uses do_action() on 'untrashed_post' after undeletion
  *
- * @param int $postid Post ID.
+ * @param int $post_id Post ID.
  * @return mixed False on failure
  */
@@ -2041 +2268 @@
  *
  * @since 1.0.0
- * @uses $wpdb
- *
- * @param int $num Optional, default is 10. Number of posts to get.
- * @return array List of posts.
- */
-function wp_get_recent_posts($num = 10) {
-    global $wpdb;
-
-    // Set the limit clause, if we got a limit
-    $num = (int) $num;
-    if ( $num ) {
-        $limit = "LIMIT $num";
-    }
-
-    $sql = "SELECT * FROM $wpdb->posts WHERE post_type = 'post' AND post_status IN ( 'draft', 'publish', 'future', 'pending', 'private' ) ORDER BY post_date DESC $limit";
-    $result = $wpdb->get_results($sql, ARRAY_A);
-
-    return $result ? $result : array();
+ * @uses wp_parse_args()
+ * @uses get_posts()
+ *
+ * @param string $deprecated Deprecated.
+ * @param array $args Optional. Overrides defaults.
+ * @param string $output Optional.
+ * @return unknown.
+ */
+function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
+
+    if ( is_numeric( $args ) ) {
+        _deprecated_argument( __FUNCTION__, '3.1', __( 'Passing an integer number of posts is deprecated. Pass an array of arguments instead.' ) );
+        $args = array( 'numberposts' => absint( $args ) );
+    }
+
+    // Set default arguments
+    $defaults = array(
+        'numberposts' => 10, 'offset' => 0,
+        'category' => 0, 'orderby' => 'post_date',
+        'order' => 'DESC', 'include' => '',
+        'exclude' => '', 'meta_key' => '',
+        'meta_value' =>'', 'post_type' => 'post', 'post_status' => 'draft, publish, future, pending, private',
+        'suppress_filters' => true
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+
+    $results = get_posts( $r );
+
+    // Backward compatibility. Prior to 3.1 expected posts to be returned in array
+    if ( ARRAY_A == $output ){
+        foreach( $results as $key => $result ) {
+            $results[$key] = get_object_vars( $result );
+        }
+        return $results ? $results : array();
+    }
+
+    return $results ? $results : false;
+
 }
 
@@ -2078 +2326 @@
     $post = get_post($postid, $mode);
 
-    if ( 
+    if (
         ( OBJECT == $mode && empty( $post->ID ) ) ||
         ( OBJECT != $mode && empty( $post['ID'] ) )
@@ -2129 +2377 @@
  *
  * @since 1.0.0
- * @link http://core.trac.wordpress.org/ticket/9084 Bug report on 'wp_insert_post_data' filter.
  * @uses $wpdb
  * @uses $wp_rewrite
  * @uses $user_ID
- *
  * @uses do_action() Calls 'pre_post_update' on post ID if this is an update.
  * @uses do_action() Calls 'edit_post' action on post ID and post data if this is an update.
- * @uses do_action() Calls 'save_post' and 'wp_insert_post' on post id and post data just before
- *                   returning.
- *
- * @uses apply_filters() Calls 'wp_insert_post_data' passing $data, $postarr prior to database
- *                       update or insert.
+ * @uses do_action() Calls 'save_post' and 'wp_insert_post' on post id and post data just before returning.
+ * @uses apply_filters() Calls 'wp_insert_post_data' passing $data, $postarr prior to database update or insert.
  * @uses wp_transition_post_status()
  *
- * @param array $postarr Optional. Overrides defaults.
+ * @param array $postarr Elements that make up post to insert.
  * @param bool $wp_error Optional. Allow return of WP_Error on failure.
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
-function wp_insert_post($postarr = array(), $wp_error = false) {
+function wp_insert_post($postarr, $wp_error = false) {
     global $wpdb, $wp_rewrite, $user_ID;
 
@@ -2274 +2517 @@
         $post_parent = 0;
 
-    if ( !empty($post_ID) ) {
-        if ( $post_parent == $post_ID ) {
-            // Post can't be its own parent
-            $post_parent = 0;
-        } elseif ( !empty($post_parent) ) {
-            $parent_post = get_post($post_parent);
-            // Check for circular dependency
-            if ( isset( $parent_post->post_parent ) && $parent_post->post_parent == $post_ID )
-                $post_parent = 0;
-        }
-    }
+    // Check the post_parent to see if it will cause a hierarchy loop
+    $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
 
     if ( isset($menu_order) )
@@ -2519 +2753 @@
  * Computes a unique slug for the post, when given the desired slug and some post details.
  *
+ * @since 2.8.0
+ *
  * @global wpdb $wpdb
  * @global WP_Rewrite $wp_rewrite
@@ -2544 +2780 @@
         $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 ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
             $suffix = 2;
             do {
@@ -2559 +2795 @@
         $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) );
 
-        if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( '@^(page)?\d+$@', $slug ) ) {
+        if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
             $suffix = 2;
             do {
@@ -2573 +2809 @@
         $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
-        if ( $post_name_check || in_array( $slug, $feeds ) ) {
+        if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
             $suffix = 2;
             do {
@@ -2614 +2850 @@
  * @param string $tags The tags to set for the post, separated by commas.
  * @param bool $append If true, don't delete existing tags, just add on. If false, replace the tags with the new tags.
- * @return bool|null Will return false if $post_id is not an integer or is 0. Will return null otherwise
+ * @return mixed Array of affected term IDs. WP_Error or false on failure.
  */
 function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
@@ -2629 +2865 @@
  * @param string $tags The tags to set for the post, separated by commas.
  * @param bool $append If true, don't delete existing tags, just add on. If false, replace the tags with the new tags.
- * @return bool|null Will return false if $post_id is not an integer or is 0. Will return null otherwise
+ * @return mixed Array of affected term IDs. WP_Error or false on failure.
  */
 function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
@@ -2649 +2885 @@
     }
 
-    wp_set_object_terms($post_id, $tags, $taxonomy, $append);
+    return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
 }
 
@@ -2705 +2941 @@
  * @uses do_action() Calls 'transition_post_status' on $new_status, $old_status and
  *  $post if there is a status change.
- * @uses do_action() Calls '${old_status}_to_$new_status' on $post if there is a status change.
- * @uses do_action() Calls '${new_status}_$post->post_type' on post ID and $post.
+ * @uses do_action() Calls '{$old_status}_to_{$new_status}' on $post if there is a status change.
+ * @uses do_action() Calls '{$new_status}_{$post->post_type}' on post ID and $post.
  *
  * @param string $new_status Transition to this post status.
@@ -2714 +2950 @@
 function wp_transition_post_status($new_status, $old_status, $post) {
     do_action('transition_post_status', $new_status, $old_status, $post);
-    do_action("${old_status}_to_$new_status", $post);
-    do_action("${new_status}_$post->post_type", $post->ID, $post);
+    do_action("{$old_status}_to_{$new_status}", $post);
+    do_action("{$new_status}_{$post->post_type}", $post->ID, $post);
 }
 
@@ -2768 +3004 @@
         }
     }
-    $pung = apply_filters('get_enclosed', $pung);
+    $pung = apply_filters('get_enclosed', $pung, $post_id);
     return $pung;
 }
@@ -2890 +3126 @@
 function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
     global $wpdb;
+    $null = null;
     $page_path = rawurlencode(urldecode($page_path));
     $page_path = str_replace('%2F', '/', $page_path);
@@ -2903 +3140 @@
 
     if ( empty($pages) )
-        return null;
+        return $null;
 
     foreach ( $pages as $page ) {
@@ -2909 +3146 @@
         $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 = %s", $curpage->post_parent, $post_type ));
+            $post_parent = $curpage->post_parent;
+            $curpage = wp_cache_get( $post_parent, 'posts' );
+            if ( false === $curpage )
+                $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $post_parent, $post_type ) );
             $path = '/' . $curpage->post_name . $path;
         }
@@ -2917 +3157 @@
     }
 
-    return null;
+    return $null;
 }
 
@@ -2973 +3213 @@
  * @since 2.0.0
  *
- * @param array $posts Posts array.
- * @param int $parent Parent page ID.
+ * @param array $pages Posts array.
+ * @param int $page_id Parent page ID.
  * @return array A list arranged by hierarchy. Children immediately follow their parents.
  */
 function &get_page_hierarchy( &$pages, $page_id = 0 ) {
-
     if ( empty( $pages ) ) {
         $result = array();
@@ -2986 +3225 @@
     $children = array();
     foreach ( (array) $pages as $p ) {
-
         $parent_id = intval( $p->post_parent );
         $children[ $parent_id ][] = $p;
-     }
-
-     $result = array();
-     _page_traverse_name( $page_id, $children, $result );
+    }
+
+    $result = array();
+    _page_traverse_name( $page_id, $children, $result );
 
     return $result;
@@ -3001 +3239 @@
  * $children contains parent-chilren relations
  *
+ * @since 2.9.0
  */
 function _page_traverse_name( $page_id, &$children, &$result ){
-
     if ( isset( $children[ $page_id ] ) ){
-
         foreach( (array)$children[ $page_id ] as $child ) {
-
             $result[ $child->ID ] = $child->post_name;
             _page_traverse_name( $child->ID, $children, $result );
@@ -3286 +3522 @@
  * @param string|array $object Arguments to override defaults.
  * @param string $file Optional filename.
- * @param int $post_parent Parent post ID.
+ * @param int $parent Parent post ID.
  * @return int Attachment ID.
  */
@@ -3436 +3672 @@
  * @uses do_action() Calls 'delete_attachment' hook on Attachment ID.
  *
- * @param int $postid Attachment ID.
+ * @param int $post_id Attachment ID.
  * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false.
  * @return mixed False on failure. Post data on success.
@@ -3512 +3748 @@
             $del_file = path_join( dirname($meta['file']), $size['file'] );
             $del_file = apply_filters('wp_delete_file', $del_file);
-            @ unlink( path_join($uploadpath['basedir'], $del_file) );
+            @ unlink( path_join($uploadpath['basedir'], $del_file) );
         }
     }
@@ -3585 +3821 @@
             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.
         }
     }
@@ -3595 +3831 @@
         $url = get_the_guid( $post->ID );
 
-    if ( 'attachment' != $post->post_type || empty($url) )
+    $url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+
+    if ( 'attachment' != $post->post_type || empty( $url ) )
         return false;
 
-    return apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+    return $url;
 }
 
@@ -3762 +4000 @@
 
 /**
- * Checked for changed slugs for published posts and save old slug.
- *
- * The function is used along with form POST data. It checks for the wp-old-slug
- * POST field. Will only be concerned with published posts and the slug actually
- * changing.
+ * Checked for changed slugs for published post objects and save the old slug.
+ *
+ * The function is used when a post object of any type is updated,
+ * by comparing the current and previous post objects.
  *
  * If the slug was changed and not already part of the old slugs then it will be
@@ -3772 +4009 @@
  * post.
  *
- * The most logically usage of this function is redirecting changed posts, so
+ * The most logically usage of this function is redirecting changed post objects, so
  * that those that linked to an changed post will be redirected to the new post.
  *
@@ -3778 +4015 @@
  *
  * @param int $post_id Post ID.
+ * @param object $post The Post Object
+ * @param object $post_before The Previous Post Object
  * @return int Same as $post_id
  */
@@ -3785 +4024 @@
         return;
 
-    // we're only concerned with published posts
-    if ( $post->post_status != 'publish' || $post->post_type != 'post' )
+    // we're only concerned with published, non-hierarchical objects
+    if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) )
         return;
 
@@ -3792 +4031 @@
 
     // if we haven't added this old slug before, add it now
-    if ( !in_array($post_before->post_name, $old_slugs) )
+    if ( !empty( $post_before->post_name ) && !in_array($post_before->post_name, $old_slugs) )
         add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);
 
@@ -3895 +4134 @@
  * @since 0.71
  *
- * @uses $wpdb
- * @uses $blog_id
  * @uses apply_filters() Calls 'get_lastpostdate' filter
- *
- * @global mixed $cache_lastpostdate Stores the last post date
- * @global mixed $pagenow The current page being viewed
  *
  * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'.
@@ -3906 +4140 @@
  */
 function get_lastpostdate($timezone = 'server') {
-    global $cache_lastpostdate, $wpdb, $blog_id;
-    $add_seconds_server = date('Z');
-    if ( !isset($cache_lastpostdate[$blog_id][$timezone]) ) {
-        switch(strtolower($timezone)) {
-            case 'gmt':
-                $lastpostdate = $wpdb->get_var("SELECT post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_date_gmt DESC LIMIT 1");
-                break;
-            case 'blog':
-                $lastpostdate = $wpdb->get_var("SELECT post_date FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_date_gmt DESC LIMIT 1");
-                break;
-            case 'server':
-                $lastpostdate = $wpdb->get_var("SELECT DATE_ADD(post_date_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_date_gmt DESC LIMIT 1");
-                break;
-        }
-        $cache_lastpostdate[$blog_id][$timezone] = $lastpostdate;
-    } else {
-        $lastpostdate = $cache_lastpostdate[$blog_id][$timezone];
-    }
-    return apply_filters( 'get_lastpostdate', $lastpostdate, $timezone );
+    return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date' ), $timezone );
 }
 
@@ -3935 +4151 @@
  *
  * @since 1.2.0
- * @uses $wpdb
- * @uses $blog_id
  * @uses apply_filters() Calls 'get_lastpostmodified' filter
  *
@@ -3943 +4157 @@
  */
 function get_lastpostmodified($timezone = 'server') {
-    global $wpdb;
-
-    $add_seconds_server = date('Z');
-    $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;
-    }
+    $lastpostmodified = _get_last_post_time( $timezone, 'modified' );
 
     $lastpostdate = get_lastpostdate($timezone);
@@ -3968 +4163 @@
         $lastpostmodified = $lastpostdate;
 
-    if ( $lastpostmodified )
-        wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' );
-
     return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
+}
+
+/**
+ * Retrieve latest post date data based on timezone.
+ *
+ * @access private
+ * @since 3.1.0
+ *
+ * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'.
+ * @param string $field Field to check. Can be 'date' or 'modified'.
+ * @return string The date.
+ */
+function _get_last_post_time( $timezone, $field ) {
+    global $wpdb;
+
+    if ( !in_array( $field, array( 'date', 'modified' ) ) )
+        return false;
+
+    $timezone = strtolower( $timezone );
+
+    $key = "lastpost{$field}:$timezone";
+
+    $date = wp_cache_get( $key, 'timeinfo' );
+
+    if ( !$date ) {
+        $add_seconds_server = date('Z');
+
+        $post_types = get_post_types( array( 'publicly_queryable' => true ) );
+        array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) );
+        $post_types = "'" . implode( "', '", $post_types ) . "'";
+
+        switch ( $timezone ) {
+            case 'gmt':
+                $date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                break;
+            case 'blog':
+                $date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                break;
+            case 'server':
+                $date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+                break;
+        }
+
+        if ( $date )
+            wp_cache_set( $key, $date, 'timeinfo' );
+    }
+
+    return $date;
 }
 
@@ -4020 +4260 @@
     $id = (int) $id;
 
+    if ( 0 === $id )
+        return;
+
     wp_cache_delete($id, 'posts');
     wp_cache_delete($id, 'post_meta');
@@ -4030 +4273 @@
 
     if ( $children = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d", $id) ) ) {
-        foreach( $children as $cid )
+        foreach ( $children as $cid ) {
+            // Loop detection
+            if ( $cid == $id )
+                continue;
             clean_post_cache( $cid );
+        }
     }
 
@@ -4107 +4354 @@
         $post_type = 'post';
 
-    if ( !is_array($post_type) && 'any' != $post_type && $update_term_cache )
-        update_object_term_cache($post_ids, $post_type);
+    if ( $update_term_cache ) {
+        if ( is_array($post_type) ) {
+            $ptypes = $post_type;
+        } elseif ( 'any' == $post_type ) {
+            // Just use the post_types in the supplied posts.
+            foreach ( $posts as $post )
+                $ptypes[] = $post->post_type;
+            $ptypes = array_unique($ptypes);
+        } else {
+            $ptypes = array($post_type);
+        }
+
+        if ( ! empty($ptypes) )
+            update_object_term_cache($post_ids, $ptypes);
+    }
 
     if ( $update_meta_cache )
@@ -4198 +4458 @@
     // 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' );
+        foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
+            wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
+            wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
+        }
     }
 
@@ -4303 +4564 @@
  * parent will be an ancestor. There will only be two ancestors at the most.
  *
- * @since unknown
+ * @since 2.5.0
  * @access private
  * @uses $wpdb
@@ -4323 +4584 @@
     $id = $_post->ancestors[] = $_post->post_parent;
     while ( $ancestor = $wpdb->get_var( $wpdb->prepare("SELECT `post_parent` FROM $wpdb->posts WHERE ID = %d LIMIT 1", $id) ) ) {
-        if ( $id == $ancestor )
+        // Loop detection: If the ancestor has been seen before, break.
+        if ( ( $ancestor == $_post->ID ) || in_array($ancestor,  $_post->ancestors) )
             break;
         $id = $_post->ancestors[] = $ancestor;
@@ -4651 +4913 @@
  *
  * @param int|object $revision_id Revision ID or revision object.
- * @param array $fields Optional. What fields to restore from.  Defaults to all.
- * @return mixed Null if error, false if no fields to restore, (int) post ID if success.
+ * @return mixed Null or WP_Error if error, deleted post if success.
  */
 function wp_delete_post_revision( $revision_id ) {
@@ -4725 +4986 @@
     }
 }
+
+/**
+ * Returns the post's parent's post_ID
+ *
+ * @since 3.1.0
+ *
+ * @param int $post_id
+ *
+ * @return int|bool false on error
+ */
+function wp_get_post_parent_id( $post_ID ) {
+    $post = get_post( $post_ID );
+    if ( !$post || is_wp_error( $post ) )
+        return false;
+    return (int) $post->post_parent;
+}
+
+/**
+ * Checks the given subset of the post hierarchy for hierarchy loops.
+ * Prevents loops from forming and breaks those that it finds.
+ *
+ * Attached to the wp_insert_post_parent filter.
+ *
+ * @since 3.1.0
+ * @uses wp_find_hierarchy_loop()
+ *
+ * @param int $post_parent ID of the parent for the post we're checking.
+ * @parem int $post_ID ID of the post we're checking.
+ *
+ * @return int The new post_parent for the post.
+ */
+function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
+    // Nothing fancy here - bail
+    if ( !$post_parent )
+        return 0;
+
+    // New post can't cause a loop
+    if ( empty( $post_ID ) )
+        return $post_parent;
+
+    // Can't be its own parent
+    if ( $post_parent == $post_ID )
+        return 0;
+
+    // Now look for larger loops
+
+    if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
+        return $post_parent; // No loop
+
+    // Setting $post_parent to the given value causes a loop
+    if ( isset( $loop[$post_ID] ) )
+        return 0;
+
+    // There's a loop, but it doesn't contain $post_ID.  Break the loop.
+    foreach ( array_keys( $loop ) as $loop_member )
+        wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+
+    return $post_parent;
+}
+
+/**
+ * Returns an array of post format slugs to their translated and pretty display versions
+ *
+ * @since 3.1.0
+ *
+ * @return array The array of translations
+ */
+function get_post_format_strings() {
+    $strings = array(
+        'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
+        'aside'    => _x( 'Aside',    'Post format' ),
+        'chat'     => _x( 'Chat',     'Post format' ),
+        'gallery'  => _x( 'Gallery',  'Post format' ),
+        'link'     => _x( 'Link',     'Post format' ),
+        'image'    => _x( 'Image',    'Post format' ),
+        'quote'    => _x( 'Quote',    'Post format' ),
+        'status'   => _x( 'Status',   'Post format' ),
+        'video'    => _x( 'Video',    'Post format' ),
+        'audio'    => _x( 'Audio',    'Post format' ),
+    );
+    return $strings;
+}
+
+/**
+ * Retrieves an array of post format slugs.
+ *
+ * @since 3.1.0
+ *
+ * @return array The array of post format slugs.
+ */
+function get_post_format_slugs() {
+    // 3.2-early: use array_combine() and array_keys( get_post_format_strings() )
+    $slugs = array(
+        'standard' => 'standard', // Special case. any value that evals to false will be considered standard
+        'aside'    => 'aside',
+        'chat'     => 'chat',
+        'gallery'  => 'gallery',
+        'link'     => 'link',
+        'image'    => 'image',
+        'quote'    => 'quote',
+        'status'   => 'status',
+        'video'    => 'video',
+        'audio'    => 'audio',
+    );
+    return $slugs;
+}
+
+/**
+ * Returns a pretty, translated version of a post format slug
+ *
+ * @since 3.1.0
+ *
+ * @param string $slug A post format slug
+ * @return string The translated post format name
+ */
+function get_post_format_string( $slug ) {
+    $strings = get_post_format_strings();
+    if ( !$slug )
+        return $strings['standard'];
+    else
+        return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+}
+
+/**
+ * Sets a post thumbnail.
+ *
+ * @since 3.1.0
+ *
+ * @param int|object $post Post ID or object where thumbnail should be attached.
+ * @param int $thumbnail_id Thumbnail to attach.
+ * @return bool True on success, false on failure.
+ */
+function set_post_thumbnail( $post, $thumbnail_id ) {
+    $post = get_post( $post );
+    $thumbnail_id = absint( $thumbnail_id );
+    if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
+        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
+        if ( ! empty( $thumbnail_html ) ) {
+            update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Returns a link to a post format index.
+ *
+ * @since 3.1.0
+ *
+ * @param $format string Post format
+ * @return string Link
+ */
+function get_post_format_link( $format ) {
+    $term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
+    if ( ! $term || is_wp_error( $term ) )
+        return false;
+    return get_term_link( $term );
+}
+
+/**
+ * Filters the request to allow for the format prefix.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_request( $qvs ) {
+    if ( ! isset( $qvs['post_format'] ) )
+        return $qvs;
+    $slugs = get_post_format_slugs();
+    if ( isset( $slugs[ $qvs['post_format'] ] ) )
+        $qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+    $tax = get_taxonomy( 'post_format' );
+    $qvs['post_type'] = $tax->object_type;
+    return $qvs;
+}
+add_filter( 'request', '_post_format_request' );
+
+/**
+ * Filters the post format term link to remove the format prefix.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_link( $link, $term, $taxonomy ) {
+    global $wp_rewrite;
+    if ( 'post_format' != $taxonomy )
+        return $link;
+    if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
+        return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
+    } else {
+        $link = remove_query_arg( 'post_format', $link );
+        return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
+    }
+}
+add_filter( 'term_link', '_post_format_link', 10, 3 );
+
+/**
+ * Remove the post format prefix from the name property of the term object created by get_term().
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_get_term( $term ) {
+    if ( isset( $term->slug ) ) {
+        $term->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+    }
+    return $term;
+}
+add_filter( 'get_post_format', '_post_format_get_term' );
+
+/**
+ * Remove the post format prefix from the name property of the term objects created by get_terms().
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_get_terms( $terms, $taxonomies, $args ) {
+    if ( in_array( 'post_format', (array) $taxonomies ) ) {
+        if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
+            foreach( $terms as $order => $name ) {
+                $terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+            }
+        } else {
+            foreach ( (array) $terms as $order => $term ) {
+                if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
+                    $terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+                }
+            }
+        }
+    }
+    return $terms;
+}
+add_filter( 'get_terms', '_post_format_get_terms', 10, 3 );
+
+/**
+ * Remove the post format prefix from the name property of the term objects created by wp_get_object_terms().
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_wp_get_object_terms( $terms ) {
+    foreach ( (array) $terms as $order => $term ) {
+        if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
+            $terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+        }
+    }
+    return $terms;
+}
+add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
+
+?>