WP Merge to WP 2.2.1

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

3 files changed, 2 insertions, 7 deletions

diff --git a/wp-includes/js/tinymce/plugins/wordpress/langs/en.js b/wp-includes/js/tinymce/plugins/wordpress/langs/en.js
index 68ca7ba..04eba01 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/langs/en.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/langs/en.js
@@ -4,10 +4,6 @@ if (navigator.userAgent.indexOf('Mac OS') != -1) {
 // Mac OS browsers use Ctrl to hit accesskeys

 	var metaKey = 'Ctrl';

 }

-else if (navigator.userAgent.indexOf('Firefox/2') != -1) {

-// Firefox 2.x uses Alt+Shift to hit accesskeys

-	var metaKey = 'Alt+Shift';

-}

 else {

 	var metaKey = 'Alt';

 }

@@ -35,3 +31,4 @@ numlist_desc : 'Ordered list (' + metaKey + '+o)',
 outdent_desc : 'Outdent (' + metaKey + '+w)',

 indent_desc : 'Indent list/blockquote (' + metaKey + '+q)'

 });

+

diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index de01c67..5c2c1c8 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -29,7 +29,7 @@
 	$plugins = apply_filters('mce_plugins', $plugins);
 	$plugins = implode($plugins, ',');
 
-	$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright', 'separator', 'link', 'unlink', 'image', 'wp_more', 'separator', 'spellchecker', 'separator', 'wp_help', 'wp_adv', 'wp_adv_start', 'formatselect', 'underline', 'justifyfull', 'forecolor', 'separator', 'pastetext', 'pasteword', 'separator', 'removeformat', 'cleanup', 'separator', 'charmap', 'separator', 'undo', 'redo', 'wp_adv_end'));
+	$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'separator', 'bullist', 'numlist', 'outdent', 'indent', 'separator', 'justifyleft', 'justifycenter', 'justifyright', 'separator', 'link', 'unlink', 'image', 'wp_more', 'separator', 'spellchecker', 'separator', 'wp_help', 'wp_adv_start', 'wp_adv', 'separator', 'formatselect', 'underline', 'justifyfull', 'forecolor', 'separator', 'pastetext', 'pasteword', 'separator', 'removeformat', 'cleanup', 'separator', 'charmap', 'separator', 'undo', 'redo', 'wp_adv_end'));
 	$mce_buttons = implode($mce_buttons, ',');
 
 	$mce_buttons_2 = apply_filters('mce_buttons_2', array());
diff --git a/wp-includes/js/tinymce/tiny_mce_popup.js b/wp-includes/js/tinymce/tiny_mce_popup.js
index c4db092..e6c91c3 100644
--- a/wp-includes/js/tinymce/tiny_mce_popup.js
+++ b/wp-includes/js/tinymce/tiny_mce_popup.js
@@ -1,5 +1,3 @@
-
-
 // Some global instances, this will be filled later
 var tinyMCE = null, tinyMCELang = null;