summaryrefslogtreecommitdiffstats
path: root/wp-includes/js/tinymce/tiny_mce_config.php
diff options
context:
space:
mode:
Diffstat (limited to 'wp-includes/js/tinymce/tiny_mce_config.php')
-rw-r--r--wp-includes/js/tinymce/tiny_mce_config.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index 5a8e4c4..757d06b 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -130,7 +130,7 @@ $mce_buttons_3 = implode($mce_buttons_3, ',');
$mce_buttons_4 = apply_filters('mce_buttons_4', array());
$mce_buttons_4 = implode($mce_buttons_4, ',');
-$do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true;
+$no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false;
// TinyMCE init settings
$initArray = array (
@@ -165,7 +165,7 @@ $initArray = array (
'tab_focus' => ':next',
'content_css' => "$mce_css",
'save_callback' => 'switchEditors.saveCallback',
- 'wpeditimage_do_captions' => $do_captions,
+ 'wpeditimage_disable_captions' => $no_captions,
'plugins' => "$plugins",
// pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
'disk_cache' => true,
@@ -225,7 +225,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
// Setup cache info
if ( $disk_cache ) {
- $cacheKey = apply_filters('tiny_mce_version', '20080710');
+ $cacheKey = apply_filters('tiny_mce_version', '20080810');
foreach ( $initArray as $v )
$cacheKey .= $v;