Changeset 39479

Timestamp:

12/04/2016 05:31:28 PM (8 years ago)

Author:

westonruter

Message:

Customize: Ensure a custom_css post insertion gets an initial post revision.

Merges [39477] onto 4.7 branch.
Props georgestephanis, westonruter.
Fixes #39032 for 4.7.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/customize/custom-css-setting.php (modified) (1 diff)

branches/4.7/src/wp-includes/theme.php

@@ -1787 +1787 @@
     } else {
         $r = wp_insert_post( wp_slash( $post_data ), true );
-    }
-
-    if ( $r instanceof WP_Error ) {
+
+        // Trigger creation of a revision. This should be removed once #30854 is resolved.
+        if ( ! is_wp_error( $r ) && 0 === count( wp_get_post_revisions( $r ) ) ) {
+            wp_save_post_revision( $r );
+        }
+    }
+
+    if ( is_wp_error( $r ) ) {
         return $r;
     }

branches/4.7/tests/phpunit/tests/customize/custom-css-setting.php

@@ -194 +194 @@
 
     /**
+     * Test revision saving on initial save of Custom CSS.
+     *
+     * @ticket 39032
+     */
+    function test_custom_css_revision_saved() {
+        $inserted_css = 'body { background: black; }';
+        $updated_css = 'body { background: red; }';
+
+        $post = wp_update_custom_css_post( $inserted_css, array(
+            'stylesheet' => 'testtheme',
+        ) );
+
+        $this->assertSame( $inserted_css, $post->post_content );
+        $revisions = array_values( wp_get_post_revisions( $post ) );
+        $this->assertCount( 1, $revisions );
+        $this->assertSame( $inserted_css, $revisions[0]->post_content );
+
+        wp_update_custom_css_post( $updated_css, array(
+            'stylesheet' => 'testtheme',
+        ) );
+
+        $revisions = array_values( wp_get_post_revisions( $post ) );
+        $this->assertCount( 2, $revisions );
+        $this->assertSame( $updated_css, $revisions[0]->post_content );
+        $this->assertSame( $inserted_css, $revisions[1]->post_content );
+    }
+
+    /**
      * Test crud methods on WP_Customize_Custom_CSS_Setting.
      *