Ticket #38672: 38672.wp_update_custom_css_post.2.diff

src/wp-includes/customize/class-wp-customize-custom-css-setting.php

@@ -287 +287 @@
                 $args = apply_filters( 'customize_update_custom_css_post_content_args', $args, $css, $setting );
                 $args = wp_array_slice_assoc( $args, array( 'post_content', 'post_content_filtered' ) );
 
-                $args = array_merge(
-                        $args,
-                        array(
-                                'post_title' => $this->stylesheet,
-                                'post_name' => sanitize_title( $this->stylesheet ),
-                                'post_type' => 'custom_css',
-                                'post_status' => 'publish',
-                        )
-                );
+                $args['stylesheet'] = $this->stylesheet;
+                $r = wp_update_custom_css_post( $args );
 
-                // Update post if it already exists, otherwise create a new one.
-                $post = wp_get_custom_css_post( $this->stylesheet );
-                if ( $post ) {
-                        $args['ID'] = $post->ID;
-                        $post_id = wp_update_post( wp_slash( $args ) );
-                } else {
-                        $post_id = wp_insert_post( wp_slash( $args ) );
-                }
-                if ( ! $post_id ) {
+                if ( $r instanceof WP_Error ) {
                         return false;
                 }
+                $post_id = $r->ID;
 
                 // Cache post ID in theme mod for performance to avoid additional DB query.
                 if ( $this->manager->get_stylesheet() === $this->stylesheet ) {

src/wp-includes/theme.php

@@ -1708 +1708 @@
 }
 
 /**
+ * Update the `custom_css` post for a given theme.
+ *
+ * Inserts a `custom_css` post when one doesn't yet exist.
+ *
+ * @since 4.7.0
+ * @access public
+ *
+ * @param array $args {
+ *     Custom CSS post args.
+ *
+ *     @type string $post_content          CSS.
+ *     @type string $post_content_filtered Pre-processed CSS. Normally empty string. Optional.
+ *     @type string $stylesheet            Stylesheet (child theme) to update. Optional, defaults to current theme/stylesheet.
+ * }
+ * @return WP_Post|WP_Error Post on success, error on failure.
+ */
+function wp_update_custom_css_post( $args ) {
+        $args = wp_parse_args( $args, array(
+                'post_content' => '',
+                'post_content_filtered' => '',
+                'stylesheet' => get_stylesheet(),
+        ) );
+
+        $args = array_merge(
+                $args,
+                array(
+                        'post_title' => $args['stylesheet'],
+                        'post_name' => sanitize_title( $args['stylesheet'] ),
+                        'post_type' => 'custom_css',
+                        'post_status' => 'publish',
+                )
+        );
+
+        // Update post if it already exists, otherwise create a new one.
+        $post = wp_get_custom_css_post( $args['stylesheet'] );
+        if ( $post ) {
+                $args['ID'] = $post->ID;
+                $r = wp_update_post( wp_slash( $args ), true );
+        } else {
+                $r = wp_insert_post( wp_slash( $args ), true );
+        }
+
+        if ( $r instanceof WP_Error ) {
+                return $r;
+        }
+        return get_post( $r );
+}
+
+/**
  * Add callback for custom TinyMCE editor stylesheets.
  *
  * The parameter $stylesheet is the name of the stylesheet, relative to

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

@@ -158 +158 @@
                 $this->assertEquals( $previewed_css, $this->setting->value() );
                 $this->assertEquals( $previewed_css, wp_get_custom_css( $this->setting->stylesheet ) );
 
+                // Make sure that wp_update_custom_css_post() works as expected for updates.
+                $r = wp_update_custom_css_post( array(
+                        'stylesheet' => $this->setting->stylesheet,
+                        'post_content' => 'body { color:red; }',
+                        'post_content_filtered' => "body\n\tcolor:red;",
+                ) );
+                $this->assertInstanceOf( 'WP_Post', $r );
+                $this->assertEquals( $post_id, $r->ID );
+                $r = wp_update_custom_css_post( array(
+                        'post_content' => 'body { content: "\o/"; }',
+                ) );
+                $this->assertEquals( $this->wp_customize->get_stylesheet(), get_post( $r )->post_name );
+                $this->assertEquals( 'body { content: "\o/"; }', get_post( $r )->post_content );
+
+                // Make sure that wp_update_custom_css_post() works as expected for insertion.
+                $r = wp_update_custom_css_post( array(
+                        'stylesheet' => 'other',
+                        'post_content' => 'body { background:black; }',
+                ) );
+                $this->assertInstanceOf( 'WP_Post', $r );
+                $this->assertEquals( 'other', get_post( $r )->post_name );
+                $this->assertEquals( 'body { background:black; }', get_post( $r )->post_content );
+                $this->assertEquals( 'publish', get_post( $r )->post_status );
+
+                // Test deletion.
                 wp_delete_post( $post_id );
                 $this->assertNull( wp_get_custom_css_post() );
                 $this->assertNull( wp_get_custom_css_post( get_stylesheet() ) );