From dd96826c3456ba7937909bf7e9f6b3b77080da75 Mon Sep 17 00:00:00 2001 From: rob1n Date: Mon, 9 Apr 2007 16:33:43 +0000 Subject: [PATCH] Default to 'en' for TinyMCE language if get_locale() is empty, to avoid meltdowns. Props m0n5t3r. fixes #4118 git-svn-id: http://svn.automattic.com/wordpress/trunk@5220 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/tinymce/tiny_mce_config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php index b1eccc762b..b1e18380ed 100644 --- a/wp-includes/js/tinymce/tiny_mce_config.php +++ b/wp-includes/js/tinymce/tiny_mce_config.php @@ -48,6 +48,8 @@ $mce_css = str_replace('http://', 'https://', $mce_css); $mce_popups_css = str_replace('http://', 'https://', $mce_popups_css); } + + $mce_locale = ( empty(get_locale()) ) ? 'en' : strtolower(get_locale()); ?> initArray = { @@ -58,7 +60,7 @@ initArray = { theme_advanced_buttons1 : "", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", - language : "", + language : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_path_location : "bottom",