From 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa Mon Sep 17 00:00:00 2001 From: donncha Date: Tue, 16 Jan 2007 21:27:04 +0000 Subject: WP Merge to rev 4753 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/script-loader.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'wp-includes/script-loader.php') diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 43e076d..bcc8bc5 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -38,7 +38,7 @@ class WP_Scripts { $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' ); $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' ); $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); - $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20061223' ); + $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070116' ); } } @@ -146,10 +146,7 @@ class WP_Scripts { foreach ( (array) $handles as $handle ) { $handle = explode('?', $handle); if ( !in_array($handle[0], $this->queue) && isset($this->scripts[$handle[0]]) ) { - if ( 'wp_tiny_mce' == $handle[0] ) // HACK: Put tinyMCE first. - array_unshift($this->queue, $handle[0]); - else - $this->queue[] = $handle[0]; + $this->queue[] = $handle[0]; if ( isset($handle[1]) ) $this->args[$handle[0]] = $handle[1]; } -- cgit