From 64f1a8a9924772992fcf2abb6535b3ea6cb07240 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Tue, 24 Mar 2015 20:33:27 +0000
Subject: [PATCH] TinyMCE: fix error and PHP warning when adding more than one
 instance in RTL mode. Part props maimairel. Fixes #31578. Built from
 https://develop.svn.wordpress.org/trunk@31874

git-svn-id: http://core.svn.wordpress.org/trunk@31853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 10 ++++++++--
 wp-includes/version.php   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9c24d0b34d..0e5600e7b2 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2906,8 +2906,14 @@ function _config_wp_siteurl( $url = '' ) {
 function _mce_set_direction( $input ) {
 	if ( is_rtl() ) {
 		$input['directionality'] = 'rtl';
-		$input['plugins'] .= ',directionality';
-		$input['toolbar1'] .= ',ltr';
+
+		if ( ! empty( $input['plugins'] ) && strpos( $input['plugins'], 'directionality' ) === false ) {
+			$input['plugins'] .= ',directionality';
+		}
+
+		if ( ! empty( $input['toolbar1'] ) && ! preg_match( '/\bltr\b/', $input['toolbar1'] ) ) {
+			$input['toolbar1'] .= ',ltr';
+		}
 	}
 
 	return $input;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3bff3b5352..b1c9af2c00 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta2-31873';
+$wp_version = '4.2-beta2-31874';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.