Changeset 8512 for trunk/wp-includes/js/tinymce/tiny_mce_config.php

Timestamp:

07/31/2008 04:01:30 AM (17 years ago)

Author:

azaozz

Message:

Latest TinyMCE, has new load options and bugfixes.

File:

• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (6 diffs)

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -181 +181 @@
 // Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0.
 
-// support for deprecated actions
-ob_start();
-do_action('mce_options');
-$mce_deprecated = ob_get_contents();
-ob_end_clean();
-
-$mce_deprecated = (string) $mce_deprecated;
-if ( strlen( $mce_deprecated ) < 10 || ! strpos( $mce_deprecated, ':' ) || ! strpos( $mce_deprecated, ',' ) )   
-    $mce_deprecated = '';
-
 // Settings for the gzip compression and cache
 $disk_cache = ( ! isset($initArray['disk_cache']) || false == $initArray['disk_cache'] ) ? false : true;
@@ -226 +216 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080712');
+    $cacheKey = apply_filters('tiny_mce_version', '20080730');
 
     foreach ( $initArray as $v )
@@ -269 +259 @@
     $mce_options .= $k . ':"' . $v . '",';
 
-if ( $mce_deprecated ) $mce_options .= $mce_deprecated;
-
 $mce_options = rtrim( trim($mce_options), '\n\r,' );
 
-$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=311" };';
+// Pre-init settings
+$content = 'var tinyMCEPreInit = { base : "'. $baseurl .'", suffix : "", query : "ver=311b", mceInit : {' . $mce_options . '}};' . "\n";
 
 // Load patch
@@ -280 +269 @@
 // Add core
 $content .= getFileContents( 'tiny_mce.js' );
-
-// Patch loading functions
-$content .= 'tinyMCEPreInit.start();';
 
 // Add all languages (WP)
@@ -295 +281 @@
     $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin.js' );
 
-// Add external plugins and init 
-$content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});';
+// Add external plugins 
+$content .= $ext_plugins;
+
+// Mark translations as done
+$content .= 'tinyMCEPreInit.start();' . "\n";
+
+// Init
+$content .= 'tinyMCE.init(tinyMCEPreInit.mceInit);';
 
 // Generate GZIP'd content
@@ -308 +300 @@
 
 // Write file
-if ( '' != $cacheKey && is_dir($cache_path) && is_readable($cache_path) ) { 
-
+if ( '' != $cacheKey && is_dir($cache_path) && is_readable($cache_path) ) {
     $old_cache = array();
     $handle = opendir($cache_path);
     while ( false !== ( $file = readdir($handle) ) ) {
         if ( $file == '.' || $file == '..' ) continue;
-        $saved = filectime("$cache_path/$file");
-        if ( strpos($file, 'tinymce_') !== false && substr($file, -3) == $cache_ext ) $old_cache["$saved"] = $file;
+        $old_cache[] = filemtime("$cache_path/$file") . strval($file);
     }
     closedir($handle);
-            
-    krsort($old_cache);
+
+    rsort($old_cache);
     if ( 1 >= $old_cache_max ) $del_cache = $old_cache;
     else $del_cache = array_slice( $old_cache, ($old_cache_max - 1) );
 
-    foreach ( $del_cache as $key )
+    foreach ( $del_cache as $key ) {
+        $key = substr($key, 10);
         @unlink("$cache_path/$key");
-
+    }
     putFileContents( $cache_file, $content );
 }