diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-04-17 16:02:04 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-04-17 16:02:04 +0000 |
| commit | 0deb6c0214bf72b43e533230f5e029edb736f175 (patch) | |
| tree | f204fe9b2520dde0b54654eac73128d57a9f6d6b /wp-includes/js/tinymce/tiny_mce_gzip.php | |
| parent | edb1d96a00c1a795249bcb84c6b9f91bc75f93b1 (diff) | |
| download | wordpress-mu-0deb6c0214bf72b43e533230f5e029edb736f175.tar.gz wordpress-mu-0deb6c0214bf72b43e533230f5e029edb736f175.tar.xz wordpress-mu-0deb6c0214bf72b43e533230f5e029edb736f175.zip | |
Merge WP 5114 at http://trac.wordpress.org/changeset/5114
Should fix #301
Added link-add to switch
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@966 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/js/tinymce/tiny_mce_gzip.php')
| -rw-r--r-- | wp-includes/js/tinymce/tiny_mce_gzip.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/wp-includes/js/tinymce/tiny_mce_gzip.php b/wp-includes/js/tinymce/tiny_mce_gzip.php index d3d7c79..59af4b6 100644 --- a/wp-includes/js/tinymce/tiny_mce_gzip.php +++ b/wp-includes/js/tinymce/tiny_mce_gzip.php @@ -119,23 +119,35 @@ if ($index > -1) { $content .= "tinyMCECompressed.loadPlugins();"; // Add core languages + $lang_content = ''; foreach ($languages as $lang) - $content .= getFileContents("langs/" . $lang . ".js"); + $lang_content .= getFileContents("langs/" . $lang . ".js"); + if ( empty($lang_content) ) + $lang_content .= getFileContents("langs/en.js"); + $content .= $lang_content; // Add themes foreach ($themes as $theme) { $content .= wp_compact_tinymce_js(getFileContents( "themes/" . $theme . "/editor_template" . $suffix . ".js")); + $lang_content = ''; foreach ($languages as $lang) - $content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js"); + $lang_content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js"); + if ( empty($lang_content) ) + $lang_content .= getFileContents("themes/" . $theme . "/langs/en.js"); + $content .= $lang_content; } // Add plugins foreach ($plugins as $plugin) { $content .= getFileContents("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js"); + $lang_content = ''; foreach ($languages as $lang) - $content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js"); + $lang_content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js"); + if ( empty($lang_content) ) + $lang_content .= getFileContents("plugins/" . $plugin . "/langs/en.js"); + $content .= $lang_content; } // Add custom files |