Ticket #22289: 22289.3.patch

wp-admin/revision.php

@@ -29 +29 @@
                 break;
 
         // Revisions disabled and we're not looking at an autosave
-        if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) {
+        if ( ! wp_revisions_enabled( $post ) && !wp_is_post_autosave( $revision ) ) {
                 $redirect = 'edit.php?post_type=' . $post->post_type;
                 break;
         }
@@ -70 +70 @@
         else
                 break; // Don't diff two unrelated revisions
 
-        if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) { // Revisions disabled
+        if ( ! wp_revisions_enabled( $post ) ) { // Revisions disabled
                 if (
                         // we're not looking at an autosave
                         ( !wp_is_post_autosave( $left_revision ) && !wp_is_post_autosave( $right_revision ) )
@@ -112 +112 @@
                 break;
 
         // Revisions disabled and we're not looking at an autosave
-        if ( ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) && !wp_is_post_autosave( $revision ) ) {
+        if ( ! wp_revisions_enabled( $post ) && !wp_is_post_autosave( $revision ) ) {
                 $redirect = 'edit.php?post_type=' . $post->post_type;
                 break;
         }
@@ -210 +210 @@
 <?php
 
 $args = array( 'format' => 'form-table', 'parent' => true, 'right' => $right, 'left' => $left );
-if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') )
+if ( ! wp_revisions_enabled( $post ) )
         $args['type'] = 'autosave';
 
 wp_list_post_revisions( $post, $args );

wp-includes/class-wp-xmlrpc-server.php

@@ -3441 +3441 @@
                         return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
 
                 // Check if revisions are enabled.
-                if ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) )
+                if ( ! wp_revisions_enabled( $post ) )
                         return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -3506 +3506 @@
                         return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
 
                 // Check if revisions are disabled.
-                if ( ! WP_POST_REVISIONS || ! post_type_supports( $post->post_type, 'revisions' ) )
+                if ( ! wp_revisions_enabled( $post ) )
                         return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
 
                 $post = wp_restore_post_revision( $revision_id );

wp-includes/post.php

@@ -5021 +5021 @@
         if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
                 return;
 
-        // WP_POST_REVISIONS = 0, false
-        if ( ! WP_POST_REVISIONS )
+        if ( !$post = get_post( $post_id, ARRAY_A ) )
                 return;
 
-        if ( !$post = get_post( $post_id, ARRAY_A ) )
+        if ( ! wp_revisions_enabled( (object) $post ) )
                 return;
 
         if ( 'auto-draft' == $post['post_status'] )
@@ -5050 +5049 @@
 
         $return = _wp_put_post_revision( $post );
 
-        // WP_POST_REVISIONS = true (default), -1
-        if ( !is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
+        $revisions_to_keep = wp_revisions_to_keep( (object) $post );
+
+        if ( $revisions_to_keep < 0 )
                 return $return;
 
         // all revisions and (possibly) one autosave
         $revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
-        // WP_POST_REVISIONS = (int) (# of autosaves to save)
-        $delete = count($revisions) - WP_POST_REVISIONS;
+        $delete = count($revisions) - $revisions_to_keep;
 
         if ( $delete < 1 )
                 return $return;
@@ -5314 +5313 @@
  * @return array empty if no revisions
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
-        if ( ! WP_POST_REVISIONS )
-                return array();
         if ( ( !$post = get_post( $post_id ) ) || empty( $post->ID ) )
                 return array();
 
+        if ( ! wp_revisions_enabled( $post ) )
+                return array();
+
         $defaults = array( 'order' => 'DESC', 'orderby' => 'date' );
         $args = wp_parse_args( $args, $defaults );
         $args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
@@ -5328 +5328 @@
         return $revisions;
 }
 
+/**
+ * Determine if revisions are enabled for a given post.
+ *
+ * @since 3.6
+ *
+ * @uses wp_revisions_to_keep
+ *
+ * @param object $post
+ * @return bool
+ */
+function wp_revisions_enabled( $post ) {
+        return wp_revisions_to_keep( $post ) != 0;
+}
+
+/**
+ * Determine how many revisions to retain for a given post.
+ * By default, an infinite number of revisions are stored if a post type supports revisions.
+ *
+ * @since 3.6
+ *
+ * @uses post_type_supports
+ * @uses apply_filters
+ *
+ * @param object $post
+ * @return int
+ */
+function wp_revisions_to_keep( $post ) {
+        $num = WP_POST_REVISIONS;
+
+        if ( true === $num )
+                $num = -1;
+        else
+                $num = intval( $num );
+
+        if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+                $num = 0;
+
+        return (int) apply_filters( 'wp_revisions_to_keep', $num, $post );
+}
+
 function _set_preview($post) {
 
         if ( ! is_object($post) )