diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-12 15:36:57 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-12 15:36:57 +0000 |
| commit | f41f35fc323e7aae3f8c9d7e696eb54e306cc679 (patch) | |
| tree | 6c998f4e79b9e79b823e01215a2b3f7b0a8e5f90 /wp-includes/script-loader.php | |
| parent | 7a2ba28084eb8b23f9109473d7c57f14c3a059a2 (diff) | |
| download | wordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.tar.gz wordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.tar.xz wordpress-mu-f41f35fc323e7aae3f8c9d7e696eb54e306cc679.zip | |
WP Merge to rev 4185
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@743 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/script-loader.php')
| -rw-r--r-- | wp-includes/script-loader.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index d5a8986..9dd8ffc 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -66,7 +66,8 @@ class WP_Scripts { if ( isset($this->args[$handle]) ) $ver .= '&' . $this->args[$handle]; $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src; - echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n"; + $src = add_query_arg('ver', $ver, $src); + echo "<script type='text/javascript' src='$src'></script>\n"; $this->printed[] = $handle; } } @@ -132,7 +133,10 @@ class WP_Scripts { foreach ( (array) $handles as $handle ) { $handle = explode('?', $handle); if ( !in_array($handle[0], $this->queue) && isset($this->scripts[$handle[0]]) ) { - $this->queue[] = $handle[0]; + if ( 'wp_tiny_mce' == $handle[0] ) // HACK: Put tinyMCE first. + array_unshift($this->queue, $handle[0]); + else + $this->queue[] = $handle[0]; if ( isset($handle[1]) ) $this->args[$handle[0]] = $handle[1]; } |