Changeset 39567

Timestamp:

12/12/2016 01:44:26 AM (8 years ago)

Author:

dd32

Message:

Customize: Prevent single quotes (apostrophes) in custom_css values from unexpectedly causing false positives for unbalanced character validation errors.

Props westonruter.
See #39218, #35395.
Merges [39559] to the 4.7 branch.
Fixes #39198.

Location:

branches/4.7

Files:

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

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

@@ -192 +192 @@
         }
 
-        // Ensure single quotes are equal.
-        if ( ! $this->validate_equal_characters( '\'', $css ) ) {
-            $validity->add( 'unequal_single_quotes', __( 'Your single quotes <code>\'</code> are uneven. Make sure there is a closing <code>\'</code> for every opening <code>\'</code>.' ) );
-            $imbalanced = true;
-        }
-
-        // Ensure single quotes are equal.
+        // Ensure double quotes are equal.
         if ( ! $this->validate_equal_characters( '"', $css ) ) {
             $validity->add( 'unequal_double_quotes', __( 'Your double quotes <code>"</code> are uneven. Make sure there is a closing <code>"</code> for every opening <code>"</code>.' ) );

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

@@ -365 +365 @@
         $this->assertTrue( array_key_exists( 'unequal_double_quotes', $result->errors ) );
 
-        // Check for Imbalanced Single Quotes.
-        $imbalanced_single_quotes = $basic_css . " div.background-image { background-image: url( 'image.jpg ); } ";
-        $result = $this->setting->validate( $imbalanced_single_quotes );
-        $this->assertTrue( array_key_exists( 'unequal_single_quotes', $result->errors ) );
-
         // Check for Unclosed Parentheses.
         $unclosed_parentheses = $basic_css . ' div.background-image { background-image: url( "image.jpg" ; } ';