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

Timestamp:

03/26/2008 03:22:53 AM (18 years ago)

Author:

ryan

Message:

Fixing several problems with TiynMCE, triggering of autosave() on an empty post in Safari 3.1, <br> tags in FF, <object> tag may break if switching from Visual to HTML mode and back several times, little cleanup of the compressor and others. Props azaozz. fixes #6384

File:

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

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

@@ -59 +59 @@
 
 /*
-Setting mce_valid_elements to *[*] skips all of the internal cleanup and can cause problems.
-The minimal setting would be -strong/-b[*],-em/-i[*],*[*].
-Best is to use the default cleanup by not specifying mce_valid_elements. It contains full set of XHTML 1.0.
-If others are needed, mce_extended_valid_elements can be used to add to it, or mce_invalid_elements to remove.
-*/
-$valid_elements = apply_filters('mce_valid_elements', '');
-$invalid_elements = apply_filters('mce_invalid_elements', '');
-$extended_valid_elements = apply_filters('mce_extended_valid_elements', '');
-
-/*
 The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
 By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
@@ -105 +95 @@
     if ( ! empty($mce_external_languages) ) {
         foreach ( $mce_external_languages as $name => $path ) {
-            if ( is_readable($path) ) { 
+            if ( is_file($path) && is_readable($path) ) { 
                 include_once($path);
                 $ext_plugins .= $strings;
@@ -163 +153 @@
     'apply_source_formatting' => false,
     'remove_linebreaks' => true,
+    'paste_auto_cleanup_on_paste' => true,
+    'paste_convert_middot_lists' => true,
+    'paste_remove_spans' => true,
+    'paste_remove_styles' => true,
+    'paste_strip_class_attributes' => 'all',
     'gecko_spellcheck' => true,
     'entities' => '38,amp,60,lt,62,gt',
@@ -176 +171 @@
 );
 
-if ( $valid_elements ) $initArray['valid_elements'] = $valid_elements;
-if ( $extended_valid_elements ) $initArray['extended_valid_elements'] = $extended_valid_elements;
-if ( $invalid_elements ) $initArray['invalid_elements'] = $invalid_elements;
-
 // 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
-$initArray = apply_filters('tiny_mce_before_init', $initArray); // changed from action to filter
+// You can modify initArray to add, remove, change elements of the config before tinyMCE.init (changed from action to filter)
+$initArray = apply_filters('tiny_mce_before_init', $initArray);
+
+// Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through "tiny_mce_before_init".
+// 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
@@ -229 +223 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080323');
+    $cacheKey = apply_filters('tiny_mce_version', '20080325');
 
     foreach ( $initArray as $v )
@@ -308 +302 @@
     $content = gzencode( $content, 9, FORCE_GZIP );
 }
+
+// Stream to client
+header( 'Content-Length: ' . strlen($content) );
+echo $content;
 
 // Write file
@@ -328 +326 @@
         @unlink("$cache_path/$key");
 
-    if ( putFileContents( $cache_file, $content ) && is_readable($cache_file) ) {
-        $mtime = gmdate( "D, d M Y H:i:s", filemtime($cache_file) ) . " GMT";
-        header( 'Last-Modified: ' . $mtime );
-        header( 'Cache-Control: must-revalidate', false );
-    }
-}
-
-// Stream to client
-header( 'Content-Length: ' . strlen($content) );
-echo $content;
+    putFileContents( $cache_file, $content );
+}
+
 ?>