Changeset 7402

Timestamp:

03/19/2008 06:53:01 PM (19 years ago)

Author:

ryan

Message:

TinyMCE cache fixes from markjaquith and azaozz. fixes #6295

File:

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

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

@@ -37 +37 @@
                 return @file_put_contents( $path, $content );
 
+        $newfile = false;
         $fp = @fopen( $path, 'wb' );
         if ($fp) {
-                fwrite( $fp, $content );
+                $newfile = fwrite( $fp, $content );
                 fclose($fp);
         }
+        return $newfile;
 }
 
@@ -59 +61 @@
 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,
-and then use extended_valid_elements to add to it.
+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 = '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],bdo,code,col[*],colgroup[*],dfn,fieldset,form[*],input[*],kbd,label[*],legend[*],noscript,optgroup[*],option[*],q[cite|class],samp,textarea[*],title,var';
-
-$extended_valid_elements = apply_filters('mce_extended_valid_elements', $extended_valid_elements);
+$extended_valid_elements = apply_filters('mce_extended_valid_elements', '');
 
 /*
@@ -106 +105 @@
         if ( ! empty($mce_external_languages) ) {
                 foreach ( $mce_external_languages as $name => $path ) {
-                        $loaded_langs[] = $name;
-                
-                        if ( is_file($path) ) include_once($path);
-                        $ext_plugins .= $strings;
+                        if ( is_readable($path) ) { 
+                                include_once($path);
+                                $ext_plugins .= $strings;
+                                $loaded_langs[] = $name;
+                        }
                 }
         }
@@ -175 +175 @@
 
 if ( $valid_elements ) $initArray['valid_elements'] = $valid_elements;
-//if ( $extended_valid_elements ) $initArray['extended_valid_elements'] = $extended_valid_elements;
+if ( $extended_valid_elements ) $initArray['extended_valid_elements'] = $extended_valid_elements;
 if ( $invalid_elements ) $initArray['invalid_elements'] = $invalid_elements;
 
@@ -243 +243 @@
 
 // Use cached file if exists
-if ( $disk_cache && is_file($cache_file) ) {
+if ( $disk_cache && is_file($cache_file) && is_readable($cache_file) ) {
 
         $mtime = gmdate("D, d M Y H:i:s", filemtime($cache_file)) . " GMT";
@@ -303 +303 @@
 
 // Write file
-if ( '' != $cacheKey ) {
-        if ( is_dir($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;
-                }
-                closedir($handle);
+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;
+        }
+        closedir($handle);
                         
-                krsort($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 )
-                        @unlink("$cache_path/$key");
-        }
-
-        putFileContents( $cache_file, $content );
-
-        $mtime = gmdate( "D, d M Y H:i:s", filemtime($cache_file) ) . " GMT";
-        header( 'Last-Modified: ' . $mtime );
+        krsort($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 )
+                @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( 'Cache-Control: must-revalidate', false );
 header( 'Content-Length: ' . strlen($content) );
 echo $content;