From 59b0096dfe777f8cb93c1cd4f55f4273fce74013 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <ocean90@git.wordpress.org>
Date: Tue, 5 Jul 2016 12:41:38 +0000
Subject: [PATCH] Customize: Fix site icon preview in RTL.

* Set the direction of previews to LTR.
* Remove the ID attribute from the favicon preview in the customizer panel. The preview in the media modal uses the same ID which prevented updating the correct favicon preview.

Fixes #37286.

git-svn-id: https://develop.svn.wordpress.org/trunk@37964 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/site-icon.css                              | 6 ++++++
 .../customize/class-wp-customize-site-icon-control.php      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/css/site-icon.css b/src/wp-admin/css/site-icon.css
index 77b8425323..a4ac1ed2c3 100644
--- a/src/wp-admin/css/site-icon.css
+++ b/src/wp-admin/css/site-icon.css
@@ -38,6 +38,12 @@
 	margin-top: 5px;
 }
 
+/* rtl:ignore */
+.site-icon-preview .favicon,
+.site-icon-preview .app-icon-preview {
+	direction: ltr;
+}
+
 .customize-control-site_icon .favicon-preview {
 	float: left;
 	margin-right: 12px;
diff --git a/src/wp-includes/customize/class-wp-customize-site-icon-control.php b/src/wp-includes/customize/class-wp-customize-site-icon-control.php
index b82001f01a..58fea53757 100644
--- a/src/wp-includes/customize/class-wp-customize-site-icon-control.php
+++ b/src/wp-includes/customize/class-wp-customize-site-icon-control.php
@@ -67,7 +67,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
 							<img src="<?php echo esc_url( admin_url( 'images/' . ( is_rtl() ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>" class="browser-preview" width="182" alt="" />
 
 							<div class="favicon">
-								<img id="preview-favicon" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
+								<img src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
 							</div>
 							<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
 						</div>