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

Timestamp:

07/11/2008 03:59:14 PM (16 years ago)

Author:

ryan

Message:

Rename wp_caption shortcode to caption. Allow themes to disable captioning. Use dashes instead of underscores in class names. Props azaozz. see #6812

File:

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

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

@@ -130 +130 @@
 $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;
 
 // TinyMCE init settings
@@ -164 +166 @@
     'content_css' => "$mce_css",
     'save_callback' => 'switchEditors.saveCallback',
+    'wpeditimage_do_captions' => $do_captions,
     'plugins' => "$plugins",
     // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
@@ -223 +226 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080709');
+    $cacheKey = apply_filters('tiny_mce_version', '20080710');
 
     foreach ( $initArray as $v )