Changeset 9469

Timestamp:

11/02/2008 02:12:26 AM (16 years ago)

Author:

azaozz

Message:

Remove outdated TinyMCE files, fix loading of translations for default plugins, fixes #7994

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (15 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (deleted)
• wp-includes/js/tinymce/tiny_mce_ext.js (deleted)

trunk/wp-admin/includes/post.php

@@ -82 +82 @@
     if ( ! isset($post_data['post_status']) )
         $post_data['post_status'] = $previous_status;
-    
+
     if (!isset( $post_data['comment_status'] ))
         $post_data['comment_status'] = 'closed';
@@ -257 +257 @@
             continue;
         }
-        
+
         if ( wp_check_post_lock( $post_ID ) ) {
             $locked[] = $post_ID;
@@ -1047 +1047 @@
     if ( ! user_can_richedit() )
         return;
-    
+
     $baseurl = includes_url('js/tinymce');
 
@@ -1062 +1062 @@
     */
     $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
-    
+
     if ( $teeny ) {
         $plugins = apply_filters( 'teeny_mce_plugins', array('safari', 'inlinepopups', 'media', 'autosave', 'fullscreen') );
@@ -1068 +1068 @@
     } else {
         $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' );
-    
+
         /*
         The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
@@ -1077 +1077 @@
         */
         $mce_external_plugins = apply_filters('mce_external_plugins', array());
-        
+
         $ext_plugins = "\n";
         if ( ! empty($mce_external_plugins) ) {
-        
+
             /*
             The following filter loads external language files for TinyMCE plugins.
@@ -1091 +1091 @@
             */
             $mce_external_languages = apply_filters('mce_external_languages', array());
-        
+
             $loaded_langs = array();
             $strings = '';
-        
+
             if ( ! empty($mce_external_languages) ) {
                 foreach ( $mce_external_languages as $name => $path ) {
@@ -1104 +1104 @@
                 }
             }
-        
+
             foreach ( $mce_external_plugins as $name => $url ) {
-        
+
                 if ( is_ssl() ) $url = str_replace('http://', 'https://', $url);
-        
+
                 $plugins[] = '-' . $name;
-        
+
                 $plugurl = dirname($url);
-                $strings = '';
+                $strings = $str1 = $str2 = '';
                 if ( ! in_array($name, $loaded_langs) ) {
-                    $plugpath = str_replace( WP_PLUGIN_URL, '', $plugurl ); 
-                    $plugpath = WP_PLUGIN_DIR . $plugpath;
+                    $path = preg_replace( '|.+?' . basename(WP_PLUGIN_URL) . '|', '', $plugurl );
+                    $path = WP_PLUGIN_DIR . $path . '/langs/';
 
                     if ( function_exists('realpath') )
                         $plugpath = realpath($plugpath);
 
-                    $path = $plugpath . '/langs/' . $mce_locale . '.js';
-                    $path2 = $plugpath . '/langs/en.js';
-
-                    if ( is_file($path) && is_readable($path) ) {
-                        $strings = @file_get_contents($path);
-                    } elseif ( 'en' != $mce_locale && is_file($path2) && is_readable($path2) ) {
-                        $strings = @file_get_contents($path2);
-                        $strings = preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $strings, 1 );
+                    if ( is_file($path . $mce_locale . '.js') )
+                        $strings .= @file_get_contents($path . $mce_locale . '.js');
+
+                    if ( is_file($path . $mce_locale . '_dlg.js') )
+                        $strings .= @file_get_contents($path . $mce_locale . '_dlg.js');
+
+                    if ( 'en' != $mce_locale && empty($strings) ) {
+                        if ( is_file($path . 'en.js') ) {
+                            $str1 = @file_get_contents($path . 'en.js');
+                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 );
+                        }
+
+                        if ( is_file($path . 'en_dlg.js') ) {
+                            $str2 = @file_get_contents($path . 'en_dlg.js');
+                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 );
+                        }
                     }
 
-                    if ( $strings )
+                    if ( ! empty($strings) )
                         $ext_plugins .= "\n" . $strings . "\n";
                 }
@@ -1141 +1149 @@
 
     $plugins = implode($plugins, ',');
-    
+
     if ( $teeny ) {
         $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold, italic, underline, blockquote, separator, strikethrough, bullist, numlist,justifyleft, justifycenter, justifyright, undo, redo, link, unlink, fullscreen') );
@@ -1149 +1157 @@
         $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ));
         $mce_buttons = implode($mce_buttons, ',');
-        
+
         $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
         $mce_buttons_2 = implode($mce_buttons_2, ',');
-        
+
         $mce_buttons_3 = apply_filters('mce_buttons_3', array());
         $mce_buttons_3 = implode($mce_buttons_3, ',');
-        
+
         $mce_buttons_4 = apply_filters('mce_buttons_4', array());
         $mce_buttons_4 = implode($mce_buttons_4, ',');
     }
     $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false;
-    
+
     // TinyMCE init settings
     $initArray = array (
@@ -1197 +1205 @@
         'plugins' => "$plugins"
     );
-    
+
     // For people who really REALLY know what they're doing with TinyMCE
     // You can modify initArray to add, remove, change elements of the config before tinyMCE.init
@@ -1218 +1226 @@
     foreach ( $initArray as $k => $v )
         $mce_options .= $k . ':"' . $v . '", ';
-    
+
     $mce_options = rtrim( trim($mce_options), '\n\r,' ); ?>
 
 <script type="text/javascript">
 /* <![CDATA[ */
-
 tinyMCEPreInit = {
     base : "<?php echo $baseurl; ?>",
@@ -1232 +1239 @@
     go : function() {
         var t = this, sl = tinymce.ScriptLoader, ln = t.mceInit.language, th = t.mceInit.theme, pl = t.mceInit.plugins;
-    
+
         sl.markDone(t.base + '/langs/' + ln + '.js');
-    
+
         sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '.js');
         sl.markDone(t.base + '/themes/' + th + '/langs/' + ln + '_dlg.js');
-    
+
         tinymce.each(pl.split(','), function(n) {
             if (n && n.charAt(0) != '-') {
@@ -1245 +1252 @@
         });
     },
-    
+
     load_ext : function(url,lang) {
         var sl = tinymce.ScriptLoader;
-    
+
         sl.markDone(url + '/langs/' + lang + '.js');
         sl.markDone(url + '/langs/' + lang + '_dlg.js');
     }
 };
-
 /* ]]> */
 </script>
 <script type="text/javascript" src="<?php echo $baseurl; ?>/tiny_mce.js?ver=<?php echo $ver; ?>"></script>
-<?php if ( 'en' == $language ) { ?>
-    <script type="text/javascript" src="<?php echo $baseurl; ?>/langs/wp-langs-en.js?ver=<?php echo $ver; ?>"></script>
+<?php if ( 'en' != $language && isset($lang) ) { ?>
+<script type="text/javascript">
+<?php echo $lang; ?>
+</script>
+<?php } else { ?>
+<script type="text/javascript" src="<?php echo $baseurl; ?>/langs/wp-langs-en.js?ver=<?php echo $ver; ?>"></script>
 <?php } ?>
 <script type="text/javascript">
-<?php if ( 'en' != $language && isset($lang) ) echo $lang; ?>
-
 <?php if ( $ext_plugins ) echo $ext_plugins; ?>
-    
+
 // Mark translations as done
 tinyMCEPreInit.go();
@@ -1270 +1278 @@
 // Init
 tinyMCE.init(tinyMCEPreInit.mceInit);
-
 </script>