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

Timestamp:

02/21/2008 09:40:25 PM (18 years ago)

Author:

ryan

Message:

TinyMCE 3.01. Props azaozz. fixes #5944

File:

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

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

@@ -63 +63 @@
 /* 
 The following filter takes an associative array of external plugins for TinyMCE in the form "name" => "url".
-It adds the plugin's name (including the required dash) to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
+It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
 The url should be absolute and should include the js file name to be loaded. 
 Example: array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' ). 
@@ -72 +72 @@
 $ext_plugins = "\n";
 foreach ( $mce_external_plugins as $name => $url ) {
-    $plugins[] = '-' . $name;
+    $plugins[] = $name;
     if ( $https ) str_replace('http://', 'https://', $url);
     
@@ -151 +151 @@
 
 // Settings for the gzip compression and cache
-$cache_path = dirname(__FILE__); // Cache path, this is where the .gz files will be stored
+$cache_path = dirname(__FILE__); // ABSPATH . 'wp-content/uploads/js_cache'; // Cache path, this is where the .gz files will be stored
 $cache_ext = '.js';
 
@@ -160 +160 @@
 $initArray['disk_cache'] = $initArray['compress'] = $initArray['old_cache_max'] = null;
 unset( $initArray['disk_cache'], $initArray['compress'], $initArray['old_cache_max'] );
+
+$isIE5 = ( ( $msie = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) && ( (int) substr( $_SERVER['HTTP_USER_AGENT'], $msie + 5, 3 ) < 6 ) ) ? true : false;
+if ( $isIE5 ) $compress = false;
 
 $plugins = explode( ',', $initArray['plugins'] );
@@ -166 +169 @@
 $enc = $cacheKey = $suffix = $mce_options = ''; 
 
-// Custom extra javascripts to pack
-$custom_js = array(); //$custom_js = apply_filters('tinymce_custom_js', array());
-
 // Check if supports gzip
 if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
@@ -187 +187 @@
     foreach ( $initArray as $v )
         $cacheKey .= $v;
-    
-    foreach ( $custom_js as $file )
-        $cacheKey .= $file;
 
     $cacheKey = md5( $cacheKey );
@@ -234 +231 @@
     $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin' . $suffix . '.js' );
 
-// Add custom files
-foreach ( $custom_js as $file )
-    $content .= getFileContents($file);
-
 // Add external plugins and init 
 $content .= $ext_plugins . 'tinyMCE.init({' . $mce_options . '});'; // $mce_deprecated2 . 
@@ -253 +246 @@
 if ( '' != $cacheKey && $cache_path ) {
     if ( $old_cache_max ) {
-        $old_keys = getFileContents('tinymce_compressed' . $cache_ext . '_key');
+        $keys_file = $cache_path . '/tinymce_compressed' . $cache_ext . '_key';
+        $old_keys = getFileContents($keys_file);
             
         if ( '' != $old_keys ) {
@@ -270 +264 @@
             $keys_ar = array_slice( $keys_ar, 0, $old_cache_max );
             $cacheKey = trim( implode( "\n", $keys_ar ) );
-            
         }
         
-        putFileContents( 'tinymce_compressed' . $cache_ext . '_key', $cacheKey );
+        putFileContents( $keys_file, $cacheKey );
     }