summaryrefslogtreecommitdiffstats
path: root/wp-includes/script-loader.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-27 11:03:10 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-27 11:03:10 +0000
commit8db1e81228b0e295199f6e3ee8a99d223c48f8c2 (patch)
tree131d8b23b9e939a9c23f24ec650b343efa918c5c /wp-includes/script-loader.php
parent13aff523358403d08dc7fcb0d844a2e6c12df41a (diff)
downloadwordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.tar.gz
wordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.tar.xz
wordpress-mu-8db1e81228b0e295199f6e3ee8a99d223c48f8c2.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@599 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/script-loader.php')
-rw-r--r--wp-includes/script-loader.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f7be9e0..71bd56c 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -15,8 +15,8 @@ class WP_Scripts {
$this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
$this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
$this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
- $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '04162006' );
- $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
+ $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '06262006a' );
+ $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '06262006a' );
if ( is_admin() ) {
$this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
$this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '3850' ); // Make changeset # the correct one
@@ -62,7 +62,7 @@ class WP_Scripts {
if ( !in_array($handle, $this->printed) && isset($this->scripts[$handle]) ) {
$ver = $this->scripts[$handle]->ver ? $this->scripts[$handle]->ver : $wp_db_version;
if ( isset($this->args[$handle]) )
- $ver .= '&' . $this->args[$handle];
+ $ver .= '&amp;' . $this->args[$handle];
$src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_settings( 'siteurl' ) . $this->scripts[$handle]->src;
echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n";
$this->printed[] = $handle;