diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-16 21:27:04 +0000 |
| commit | 72e9496bfc2f7a962cf4f428ccab25c7a0175aaa (patch) | |
| tree | af3e2ca7136c77140d9e9201e3f495a4b8e7a6da /wp-includes/script-loader.php | |
| parent | 04b67169db33e30f5ca63dbbafe551fdc6fb2164 (diff) | |
| download | wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.gz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.tar.xz wordpress-mu-72e9496bfc2f7a962cf4f428ccab25c7a0175aaa.zip | |
WP Merge to rev 4753
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@849 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/script-loader.php')
| -rw-r--r-- | wp-includes/script-loader.php | 7 |
1 files changed, 2 insertions, 5 deletions
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]; } |