Changeset 39151

Timestamp:

11/07/2016 06:12:28 PM (8 years ago)

Author:

westonruter

Message:

Customize: Move Custom CSS control placeholder help text to setting default value.

The WP_Customize_Custom_CSS_Setting::value() method now returns the default if wp_get_custom_css() returns empty.

Props westonruter, afercia, helen.
See #35395.
Fixes #38685.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3600 +3600 @@
         $custom_css_setting = new WP_Customize_Custom_CSS_Setting( $this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
             'capability' => 'unfiltered_css',
+            'default' => sprintf( "/*\n%s\n*/", __( "You can add your own CSS here.\n\nClick the help icon above to learn more." ) ),
         ) );
         $this->add_setting( $custom_css_setting );
@@ -3607 +3608 @@
             'section'  => 'custom_css',
             'settings' => array( 'default' => $custom_css_setting->id ),
-            'input_attrs' => array(
-                'placeholder' => __( "/*\nYou can add your own CSS here.\n\nClick the help icon above to learn more.\n*/" ),
-            )
         ) );
     }

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

@@ -129 +129 @@
      */
     public function value() {
-        return wp_get_custom_css( $this->stylesheet );
+        $value = wp_get_custom_css( $this->stylesheet );
+        if ( empty( $value ) ) {
+            $value = $this->default;
+        }
+        return $value;
     }
 

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

@@ -102 +102 @@
 
     /**
-     * Test WP_Customize_Custom_CSS_Setting::update().
+     * Test crud methods on WP_Customize_Custom_CSS_Setting.
      *
      * @covers wp_get_custom_css()
@@ -110 +110 @@
      */
     function test_crud() {
+
+        $this->setting->default = '/* Hello World */';
+        $this->assertEquals( $this->setting->default, $this->setting->value() );
+
         $original_css = 'body { color: black; }';
         $this->factory()->post->create( array(