Changes from trunk/wp-includes/js/tinymce/tiny_mce_config.php at r8313 to branches/2.6/wp-includes/js/tinymce/tiny_mce_config.php at r8607

File:

• branches/2.6/wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)

branches/2.6/wp-includes/js/tinymce/tiny_mce_config.php

@@ -131 +131 @@
 $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
@@ -166 +166 @@
     '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"
@@ -226 +226 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080710');
+    $cacheKey = apply_filters('tiny_mce_version', '20080810');
 
     foreach ( $initArray as $v )