WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE cache fixes from markjaquith and azaozz. fixes #6295 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-19 18:53:01 +00:00
parent c6fa4c36ee
commit 81466f4604
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wp-includes/js/tinymce/tiny_mce_config.php
View File

@ -36,11 +36,13 @@ function putFileContents( $path, $content ) {
if ( function_exists('file_put_contents') ) if ( function_exists('file_put_contents') )
return @file_put_contents( $path, $content ); return @file_put_contents( $path, $content );
$newfile = false;
$fp = @fopen( $path, 'wb' ); $fp = @fopen( $path, 'wb' );
if ($fp) { if ($fp) {
fwrite( $fp, $content ); $newfile = fwrite( $fp, $content );
fclose($fp); fclose($fp);
} }
return $newfile;
} }
// Set up init variables // Set up init variables
@ -58,15 +60,12 @@ $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0
/* /*
Setting mce_valid_elements to *[*] skips all of the internal cleanup and can cause problems. Setting mce_valid_elements to *[*] skips all of the internal cleanup and can cause problems.
The minimal setting would be -strong/-b[*],-em/-i[*],*[*]. The minimal setting would be -strong/-b[*],-em/-i[*],*[*].
Best is to use the default cleanup by not specifying mce_valid_elements, Best is to use the default cleanup by not specifying mce_valid_elements. It contains full set of XHTML 1.0.
and then use extended_valid_elements to add to it. 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', ''); $valid_elements = apply_filters('mce_valid_elements', '');
$invalid_elements = apply_filters('mce_invalid_elements', ''); $invalid_elements = apply_filters('mce_invalid_elements', '');
$extended_valid_elements = apply_filters('mce_extended_valid_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);
/* /*
The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu. The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
@ -105,10 +104,11 @@ if ( ! empty($mce_external_plugins) ) {
if ( ! empty($mce_external_languages) ) { if ( ! empty($mce_external_languages) ) {
foreach ( $mce_external_languages as $name => $path ) { foreach ( $mce_external_languages as $name => $path ) {
$loaded_langs[] = $name; if ( is_readable($path) ) {
include_once($path);
if ( is_file($path) ) include_once($path);
$ext_plugins .= $strings; $ext_plugins .= $strings;
$loaded_langs[] = $name;
}
} }
} }
@ -174,7 +174,7 @@ $initArray = array (
); );
if ( $valid_elements ) $initArray['valid_elements'] = $valid_elements; 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; if ( $invalid_elements ) $initArray['invalid_elements'] = $invalid_elements;
// For people who really REALLY know what they're doing with TinyMCE // For people who really REALLY know what they're doing with TinyMCE
@ -242,7 +242,7 @@ header( 'Vary: Accept-Encoding' ); // Handle proxies
header( 'Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . ' GMT' ); header( 'Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . ' GMT' );
// Use cached file if exists // 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"; $mtime = gmdate("D, d M Y H:i:s", filemtime($cache_file)) . " GMT";
@ -302,8 +302,7 @@ if ( '.gz' == $cache_ext ) {
} }
// Write file // Write file
if ( '' != $cacheKey ) { if ( '' != $cacheKey && is_dir($cache_path) && is_readable($cache_path) ) {
if ( is_dir($cache_path) ) {
$old_cache = array(); $old_cache = array();
$handle = opendir($cache_path); $handle = opendir($cache_path);
@ -320,16 +319,15 @@ if ( '' != $cacheKey ) {
foreach ( $del_cache as $key ) foreach ( $del_cache as $key )
@unlink("$cache_path/$key"); @unlink("$cache_path/$key");
}
putFileContents( $cache_file, $content );
if ( putFileContents( $cache_file, $content ) && is_readable($cache_file) ) {
$mtime = gmdate( "D, d M Y H:i:s", filemtime($cache_file) ) . " GMT"; $mtime = gmdate( "D, d M Y H:i:s", filemtime($cache_file) ) . " GMT";
header( 'Last-Modified: ' . $mtime ); header( 'Last-Modified: ' . $mtime );
header( 'Cache-Control: must-revalidate', false );
}
} }
// Stream to client // Stream to client
header( 'Cache-Control: must-revalidate', false );
header( 'Content-Length: ' . strlen($content) ); header( 'Content-Length: ' . strlen($content) );
echo $content; echo $content;
?> ?>