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

Timestamp:

03/04/2008 12:07:29 AM (18 years ago)

Author:

ryan

Message:

Update to TinyMCE 3.03. Define shortcuts. Relocate cached TMCE file. Props azaozz. fixes #6084

File:

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

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

@@ -83 +83 @@
 $mce_buttons = implode($mce_buttons, ',');
 
-$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', '|', 'removeformat', 'cleanup', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
+$mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ));
 $mce_buttons_2 = implode($mce_buttons_2, ',');
 
@@ -115 +115 @@
     'remove_script_host' => false,
     'fix_list_elements' => true,
-//  'fix_table_elements' => true,
+    'fix_table_elements' => true,
     'gecko_spellcheck' => true,
     'entities' => '38,amp,60,lt,62,gt',
@@ -124 +124 @@
     'plugins' => "$plugins",
     // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
-    'disk_cache' => false,
+    'disk_cache' => true,
     'compress' => true,
     'old_cache_max' => '1' // number of cache files to keep
@@ -142 +142 @@
 ob_end_clean();
 
-/*
-// Do we need to support this? Most likely will break TinyMCE 3...
-ob_start();
-do_action('tinymce_before_init');
-$mce_deprecated2 = ob_get_contents() || '';
-ob_end_clean();
-*/
-
 // Settings for the gzip compression and cache
-$cache_path = dirname(__FILE__); // ABSPATH . 'wp-content/uploads/js_cache'; // Cache path, this is where the .gz files will be stored
-$cache_ext = '.js';
-
 $disk_cache = ( ! isset($initArray['disk_cache']) || false == $initArray['disk_cache'] ) ? false : true;
 $compress = ( ! isset($initArray['compress']) || false == $initArray['compress'] ) ? false : true;
@@ -163 +152 @@
 $isIE5 = ( ( $msie = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) && ( (int) substr( $_SERVER['HTTP_USER_AGENT'], $msie + 5, 3 ) < 6 ) ) ? true : false;
 if ( $isIE5 ) $compress = false;
+
+// Cache path, this is where the .gz files will be stored
+$cache_path = ABSPATH . 'wp-content/uploads/js_cache'; 
+if ( $disk_cache && ! is_dir($cache_path) )
+    $disk_cache = mkdir($cache_path);
+
+$cache_ext = '.js';
 
 $plugins = explode( ',', $initArray['plugins'] );
@@ -180 +176 @@
 
 // Setup cache info
-if ( $disk_cache && $cache_path ) {
+if ( $disk_cache ) {
 
     $ver = isset($_GET['ver']) ? (int) $_GET['ver'] : '';
@@ -232 +228 @@
 
 // Add external plugins and init 
-$content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});'; // $mce_deprecated2 . 
+$content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});';
 
 // Generate GZIP'd content
@@ -244 +240 @@
 
 // Write file
-if ( '' != $cacheKey && $cache_path ) {
+if ( '' != $cacheKey ) {
     if ( $old_cache_max ) {
         $keys_file = $cache_path . '/tinymce_compressed' . $cache_ext . '_key';