From 620d169b35d13a1c2f79cca5b41393693c062089 Mon Sep 17 00:00:00 2001
From: Dion Hulse <dd32@git.wordpress.org>
Date: Mon, 12 Dec 2016 01:44:26 +0000
Subject: [PATCH] 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.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@39567 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../customize/class-wp-customize-custom-css-setting.php   | 8 +-------
 tests/phpunit/tests/customize/custom-css-setting.php      | 5 -----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
index cb0f151aed..3189ae9262 100644
--- a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -191,13 +191,7 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 			$imbalanced = true;
 		}
 
-		// 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>.' ) );
 			$imbalanced = true;
diff --git a/tests/phpunit/tests/customize/custom-css-setting.php b/tests/phpunit/tests/customize/custom-css-setting.php
index 102d303a0c..7aff1b43b5 100644
--- a/tests/phpunit/tests/customize/custom-css-setting.php
+++ b/tests/phpunit/tests/customize/custom-css-setting.php
@@ -364,11 +364,6 @@ class Test_WP_Customize_Custom_CSS_Setting extends WP_UnitTestCase {
 		$result = $this->setting->validate( $imbalanced_double_quotes );
 		$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" ; } ';
 		$result = $this->setting->validate( $unclosed_parentheses );