Changeset 31874

Timestamp:

03/24/2015 08:32:23 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE: fix error and PHP warning when adding more than one instance in RTL mode.
Part props maimairel. Fixes #31578.

File:

• trunk/src/wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -2907 +2907 @@
         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';
+                }
         }