Changeset 39185

Timestamp:

11/09/2016 08:42:22 PM (8 years ago)

Author:

westonruter

Message:

Customize: Split out custom_css query logic from wp_get_custom_css() into a re-usable wp_get_custom_css_post() function to also be used when updating.

Props georgestephanis, westonruter.
See #38672, #35395.

Location:

trunk

Files:

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

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

@@ -237 +237 @@
 
         // Update post if it already exists, otherwise create a new one.
-        $post_id = null;
-        $query = new WP_Query( array(
-            'post_type' => 'custom_css',
-            'post_status' => get_post_stati(),
-            'name' => sanitize_title( $this->stylesheet ),
-            'number' => 1,
-            'no_found_rows' => true,
-            'cache_results' => true,
-            'update_post_meta_cache' => false,
-            'update_term_meta_cache' => false,
-            'suppress_filters' => true,
-        ) );
-        if ( ! empty( $query->post ) ) {
-            $args['ID'] = $query->post->ID;
+        $post = wp_get_custom_css_post( $this->stylesheet );
+        if ( $post ) {
+            $args['ID'] = $post->ID;
             $post_id = wp_update_post( wp_slash( $args ) );
         } else {

trunk/src/wp-includes/theme.php

@@ -1575 +1575 @@
 
 /**
- * Fetch the saved Custom CSS content.
- *
- * Gets the content of a Custom CSS post that matches the
- * current theme.
+ * Fetch the `custom_css` post for a given theme.
  *
  * @since 4.7.0
@@ -1584 +1581 @@
  *
  * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
- *
- * @return string The Custom CSS Post content.
- */
-function wp_get_custom_css( $stylesheet = '' ) {
-    $css = '';
-
+ * @return WP_Post|null The custom_css post or null if none exists.
+ */
+function wp_get_custom_css_post( $stylesheet = '' ) {
     if ( empty( $stylesheet ) ) {
         $stylesheet = get_stylesheet();
@@ -1595 +1589 @@
 
     $custom_css_query_vars = array(
-        'post_type' => 'custom_css',
-        'post_status' => get_post_stati(),
-        'name' => sanitize_title( $stylesheet ),
-        'number' => 1,
-        'no_found_rows' => true,
-        'cache_results' => true,
+        'post_type'              => 'custom_css',
+        'post_status'            => get_post_stati(),
+        'name'                   => sanitize_title( $stylesheet ),
+        'number'                 => 1,
+        'no_found_rows'          => true,
+        'cache_results'          => true,
         'update_post_meta_cache' => false,
         'update_term_meta_cache' => false,
@@ -1608 +1602 @@
     if ( get_stylesheet() === $stylesheet ) {
         $post_id = get_theme_mod( 'custom_css_post_id' );
-        if ( ! $post_id ) {
+        if ( ! $post_id || ! get_post( $post_id ) ) {
             $query = new WP_Query( $custom_css_query_vars );
             $post = $query->post;
-
             /*
              * Cache the lookup. See WP_Customize_Custom_CSS_Setting::update().
@@ -1625 +1618 @@
     }
 
+    return $post;
+}
+
+/**
+ * Fetch the saved Custom CSS content.
+ *
+ * @since 4.7.0
+ * @access public
+ *
+ * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme.
+ * @return string The Custom CSS Post content.
+ */
+function wp_get_custom_css( $stylesheet = '' ) {
+    $css = '';
+
+    if ( empty( $stylesheet ) ) {
+        $stylesheet = get_stylesheet();
+    }
+
+    $post = wp_get_custom_css_post( $stylesheet );
     if ( $post ) {
         $css = $post->post_content;

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

@@ -46 +46 @@
 
         do_action( 'customize_register', $this->wp_customize );
-        $this->setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[twentysixteen]' );
+        $this->setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[' . get_stylesheet() . ']' );
         $this->wp_customize->add_setting( $this->setting );
     }
@@ -79 +79 @@
         $this->assertTrue( post_type_exists( 'custom_css' ) );
         $this->assertEquals( 'custom_css', $this->setting->type );
-        $this->assertEquals( 'twentysixteen', $this->setting->stylesheet );
+        $this->assertEquals( get_stylesheet(), $this->setting->stylesheet );
         $this->assertEquals( 'edit_css', $this->setting->capability );
 
@@ -114 +114 @@
         $this->assertEquals( $this->setting->default, $this->setting->value() );
 
+        $this->assertNull( wp_get_custom_css_post() );
+        $this->assertNull( wp_get_custom_css_post( $this->setting->stylesheet ) );
+        $this->assertNull( wp_get_custom_css_post( 'twentyten' ) );
+
         $original_css = 'body { color: black; }';
-        $this->factory()->post->create( array(
+        $post_id = $this->factory()->post->create( array(
             'post_title' => $this->setting->stylesheet,
             'post_name' => $this->setting->stylesheet,
-            'post_content' => 'body { color: black; }',
+            'post_content' => $original_css,
             'post_status' => 'publish',
             'post_type' => 'custom_css',
         ) );
+        $twentyten_css = 'body { color: red; }';
+        $twentyten_post_id = $this->factory()->post->create( array(
+            'post_title' => 'twentyten',
+            'post_name' => 'twentyten',
+            'post_content' => $twentyten_css,
+            'post_status' => 'publish',
+            'post_type' => 'custom_css',
+        ) );
+        $twentyten_setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[twentyten]' );
+
+        $this->assertEquals( $post_id, wp_get_custom_css_post()->ID );
+        $this->assertEquals( $post_id, wp_get_custom_css_post( $this->setting->stylesheet )->ID );
+        $this->assertEquals( $twentyten_post_id, wp_get_custom_css_post( 'twentyten' )->ID );
 
         $this->assertEquals( $original_css, wp_get_custom_css( $this->setting->stylesheet ) );
         $this->assertEquals( $original_css, $this->setting->value() );
+        $this->assertEquals( $twentyten_css, wp_get_custom_css( 'twentyten' ) );
+        $this->assertEquals( $twentyten_css, $twentyten_setting->value() );
 
         $updated_css = 'body { color: blue; }';
@@ -139 +158 @@
         $this->assertEquals( $previewed_css, $this->setting->value() );
         $this->assertEquals( $previewed_css, wp_get_custom_css( $this->setting->stylesheet ) );
+
+        wp_delete_post( $post_id );
+        $this->assertNull( wp_get_custom_css_post() );
+        $this->assertNull( wp_get_custom_css_post( get_stylesheet() ) );
+        $this->assertEquals( $previewed_css, wp_get_custom_css( get_stylesheet() ), 'Previewed value remains in spite of deleted post.' );
+        wp_delete_post( $twentyten_post_id );
+        $this->assertNull( wp_get_custom_css_post( 'twentyten' ) );
+        $this->assertEquals( '', wp_get_custom_css( 'twentyten' ) );
     }