diff --git a/wp-admin/cache-manifest.php b/wp-admin/cache-manifest.php
index 266fc1a700..9965678336 100644
--- a/wp-admin/cache-manifest.php
+++ b/wp-admin/cache-manifest.php
@@ -15,15 +15,10 @@ error_reporting(0);
/** Set ABSPATH for execution */
define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
-define( 'WPINC', 'wp-includes' );
require(ABSPATH . '/wp-admin/includes/manifest.php');
-$man_version = '';
-
-$files = get_manifest($man_version);
-
-$man_version = md5($man_version);
+$files = get_manifest();
header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
@@ -31,10 +26,10 @@ header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
header( 'Pragma: no-cache' );
header( 'Content-Type: text/cache-manifest; charset=UTF-8' );
?>
-CACHE MANIFEST
-#
-# Version: _20080710
-#
+CACHE MANIFEST
+#
+# Version:
+#
{
"betaManifestVersion" : 1,
-"version" : "_20081201",
+"version" : "",
"entries" : [
registered as $script ) {
- if ( empty($script->src) ) continue;
- $ver = empty($script->ver) ? $wp_version : $script->ver;
- if ( 'editor' == $script->handle ) $mce_ver = $script->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
- $files[] = array($src, $ver);
- $man_ver .= $ver;
- }
-
- foreach ( $wp_styles->registered as $style ) {
- if ( empty($style->src) ) continue;
-
- $ver = empty($style->ver) ? $wp_version : $style->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
- if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
- $files[] = array($src, $ver);
- $man_ver .= $ver;
-
- if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
- if ( is_bool( $style->extra['rtl'] ) )
- $rtl_href = str_replace( '.css', '-rtl.css', $src );
- else
- $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
-
- $files[] = array($rtl_href, $ver);
- $man_ver .= $ver;
- }
- }
-
- $images = array(
+ $files = array(
array('images/align-center.png'),
array('images/align-left.png'),
array('images/align-none.png'),
@@ -203,11 +88,11 @@ function &get_manifest(&$man_ver) {
array('../wp-includes/js/thickbox/tb-close.png'),
);
- $files = array_merge($files, $images);
-
if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
$mce = array(
- array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true),
+ array('../wp-includes/js/tinymce/wp-tinymce.php', 'c=1&' . $mce_ver, true),
+ array('../wp-includes/js/tinymce/wp-tinymce.php', 'c=0&' . $mce_ver, true),
+
array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true),
array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true),
array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true),
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 351f0443c9..b37c2bb27a 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1151,13 +1151,18 @@ function post_preview() {
/**
* Adds the TinyMCE editor used on the Write and Edit screens.
*
- * Has option to output a trimmed down version used in Press This.
- *
* @package WordPress
* @since 2.7
+ *
+ * TinyMCE is loaded separately from other Javascript by using wp-tinymce.php. It outputs concatenated
+ * and optionaly pre-compressed version of the core and all default plugins. Additional plugins are loaded
+ * directly by TinyMCE using non-blocking method. Custom plugins can be refreshed by adding a query string
+ * to the URL when queueing them with the mce_external_plugins filter.
+ *
+ * @param bool $teeny optional Output a trimmed down version used in Press This.
*/
function wp_tiny_mce( $teeny = false ) {
- global $concatenate_scripts, $compress_scripts;
+ global $concatenate_scripts, $compress_scripts, $tinymce_version;
if ( ! user_can_richedit() )
return;
@@ -1334,7 +1339,16 @@ function wp_tiny_mce( $teeny = false ) {
$language = $initArray['language'];
$zip = $compress_scripts ? 1 : 0;
- $ver = apply_filters('tiny_mce_version', '323');
+
+ /**
+ * Deprecated
+ *
+ * The tiny_mce_version filter is not needed since external plugins are loaded directly by TinyMCE.
+ * These plugins can be refreshed by appending query string to the URL passed to mce_external_plugins filter.
+ * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).
+ */
+ $version = apply_filters('tiny_mce_version', '');
+ $version = 'ver=' . $tinymce_version . $version;
if ( 'en' != $language )
include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php');
@@ -1350,7 +1364,7 @@ function wp_tiny_mce( $teeny = false ) {
tinyMCEPreInit = {
base : "",
suffix : "",
- query : "ver=",
+ query : "",
mceInit : {},
load_ext : function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
};
@@ -1359,14 +1373,14 @@ tinyMCEPreInit = {
\n";
+ echo "\n";
else
- echo "\n";
+ echo "\n";
if ( 'en' != $language && isset($lang) )
echo "\n";
else
- echo "\n";
+ echo "\n";
?>