Changeset 39688
- Timestamp:
- 01/05/2017 07:12:23 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/theme.php
r39676 r39688 1654 1654 if ( $post_id > 0 && get_post( $post_id ) ) { 1655 1655 $post = get_post( $post_id ); 1656 } else { 1656 } 1657 1658 // `-1` indicates no post exists; no query necessary. 1659 if ( ! $post && -1 !== $post_id ) { 1657 1660 $query = new WP_Query( $custom_css_query_vars ); 1658 1661 $post = $query->post; 1659 1662 /* 1660 * Cache the lookup. See WP_Customize_Custom_CSS_Setting::update().1663 * Cache the lookup. See wp_update_custom_css_post(). 1661 1664 * @todo This should get cleared if a custom_css post is added/removed. 1662 1665 */ 1663 if ( $post ) { 1664 set_theme_mod( 'custom_css_post_id', $post->ID ); 1665 } elseif ( -1 !== $post_id ) { 1666 set_theme_mod( 'custom_css_post_id', -1 ); 1667 } 1666 set_theme_mod( 'custom_css_post_id', $post ? $post->ID : -1 ); 1668 1667 } 1669 1668 } else { … … 1789 1788 $r = wp_insert_post( wp_slash( $post_data ), true ); 1790 1789 1791 // Trigger creation of a revision. This should be removed once #30854 is resolved. 1792 if ( ! is_wp_error( $r ) && 0 === count( wp_get_post_revisions( $r ) ) ) { 1793 wp_save_post_revision( $r ); 1790 if ( ! is_wp_error( $r ) ) { 1791 if ( get_stylesheet() === $args['stylesheet'] ) { 1792 set_theme_mod( 'custom_css_post_id', $r ); 1793 } 1794 1795 // Trigger creation of a revision. This should be removed once #30854 is resolved. 1796 if ( 0 === count( wp_get_post_revisions( $r ) ) ) { 1797 wp_save_post_revision( $r ); 1798 } 1794 1799 } 1795 1800 } -
trunk/tests/phpunit/tests/customize/custom-css-setting.php
r39559 r39688 136 136 $twentyten_setting = new WP_Customize_Custom_CSS_Setting( $this->wp_customize, 'custom_css[twentyten]' ); 137 137 138 remove_theme_mod( 'custom_css_post_id' ); 139 138 140 $this->assertEquals( $post_id, wp_get_custom_css_post()->ID ); 139 141 $this->assertEquals( $post_id, wp_get_custom_css_post( $this->setting->stylesheet )->ID ); … … 222 224 223 225 /** 226 * Test that wp_get_custom_css_post() doesn't query for a post after caching a failed lookup. 227 * 228 * @ticket 39259 229 */ 230 function test_get_custom_css_post_queries_after_failed_lookup() { 231 set_theme_mod( 'custom_css_post_id', -1 ); 232 $queries_before = get_num_queries(); 233 wp_get_custom_css_post(); 234 $this->assertSame( get_num_queries(), $queries_before ); 235 } 236 237 /** 238 * Test that wp_update_custom_css_post() updates the 'custom_css_post_id' theme mod. 239 * 240 * @ticket 39259 241 */ 242 function test_update_custom_css_updates_theme_mod() { 243 set_theme_mod( 'custom_css_post_id', -1 ); 244 $post = wp_update_custom_css_post( 'body { background: blue; }' ); 245 $this->assertSame( $post->ID, get_theme_mod( 'custom_css_post_id' ) ); 246 } 247 248 /** 224 249 * Test crud methods on WP_Customize_Custom_CSS_Setting. 225 250 * … … 238 263 'post_type' => 'custom_css', 239 264 ) ); 265 remove_theme_mod( 'custom_css_post_id' ); 240 266 $this->assertEquals( '/*custom*//*filtered*/', $this->setting->value() ); 241 267
Note: See TracChangeset
for help on using the changeset viewer.