Changeset 38349 for trunk/src/wp-includes/functions.php

Timestamp:

08/25/2016 01:19:24 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE: fix toolbars alignment in RTL.

Fixes #37760 for trunk.

File:

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

trunk/src/wp-includes/functions.php

@@ -3221 +3221 @@
  * plugin, and adds the 'ltr' button to 'toolbar1', formerly
  * 'theme_advanced_buttons1' array keys. These keys are then returned
- * in the $input (TinyMCE settings) array.
+ * in the $mce_init (TinyMCE settings) array.
  *
  * @since 2.1.0
  * @access private
  *
- * @param array $input MCE settings array.
+ * @param array $mce_init MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $input ) {
+function _mce_set_direction( $mce_init ) {
         if ( is_rtl() ) {
-                $input['directionality'] = 'rtl';
-
-                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;
+                $mce_init['directionality'] = 'rtl';
+                $mce_init['rtl_ui'] = true;
+
+                if ( ! empty( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
+                        $mce_init['plugins'] .= ',directionality';
+                }
+
+                if ( ! empty( $mce_init['toolbar1'] ) && ! preg_match( '/\bltr\b/', $mce_init['toolbar1'] ) ) {
+                        $mce_init['toolbar1'] .= ',ltr';
+                }
+        }
+
+        return $mce_init;
 }