WP Merge to rev 4258

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@774 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 8 insertions, 3 deletions

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 1bd1487..1762e89 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1193,12 +1193,16 @@ function wp_die($message, $title = '') {
 
 function _mce_set_direction() {
 	global $wp_locale;
-	if ('rtl' == $wp_locale->text_direction)
+
+	if ('rtl' == $wp_locale->text_direction) {
 		echo 'directionality : "rtl" ,';
+		echo 'theme_advanced_toolbar_align : "right" ,';
+	}
 }
 
 function _mce_load_rtl_plugin($input) {
-	global $wp_locale; 
+	global $wp_locale;
+
 	if ('rtl' == $wp_locale->text_direction)
 		$input[] = 'directionality';
 
@@ -1206,7 +1210,8 @@ function _mce_load_rtl_plugin($input) {
 }
 
 function _mce_add_direction_buttons($input) {
-	global $wp_locale; 
+	global $wp_locale;
+
 	if ('rtl' == $wp_locale->text_direction) {
 		$new_buttons = array('separator', 'ltr', 'rtl');
 		$input = array_merge($input, $new_buttons);