From f41f35fc323e7aae3f8c9d7e696eb54e306cc679 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 12 Sep 2006 15:36:57 +0000
Subject: WP Merge to rev 4185

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@743 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/script-loader.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'wp-includes/script-loader.php')

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 .= '&amp;' . $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];
 			}
-- 
cgit