diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css
index da7aaeca6..9c9a9d8d6 100644
--- a/wp-admin/css/press-this.css
+++ b/wp-admin/css/press-this.css
@@ -416,6 +416,7 @@ ul.categorychecklist li {
#saving {
display: inline;
+ vertical-align: middle;
}
.submit input,
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 4fddd0982..d1240b2d5 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -472,7 +472,7 @@ function post_comment_meta_box($post) {
- ![](images/wpspin.gif)
+ ![](images/wpspin_light.gif)
diff --git a/wp-admin/images/wpspin.gif b/wp-admin/images/wpspin.gif
deleted file mode 100644
index 80fc8088f..000000000
Binary files a/wp-admin/images/wpspin.gif and /dev/null differ
diff --git a/wp-admin/images/wpspin_dark.gif b/wp-admin/images/wpspin_dark.gif
new file mode 100644
index 000000000..daebe0dbe
Binary files /dev/null and b/wp-admin/images/wpspin_dark.gif differ
diff --git a/wp-admin/images/wpspin_light.gif b/wp-admin/images/wpspin_light.gif
new file mode 100644
index 000000000..e10b97ff9
Binary files /dev/null and b/wp-admin/images/wpspin_light.gif differ
diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php
index c5473adc1..18a27bcc5 100644
--- a/wp-admin/import/livejournal.php
+++ b/wp-admin/import/livejournal.php
@@ -963,7 +963,7 @@ class LJ_API_Import {
if ( next_counter <= 0 ) {
if ( jQuery( '#' ).length ) {
jQuery( "# input[type='submit']" ).hide();
- str = '
';
+ str = '
';
jQuery( '#' ).html( str );
jQuery( '#' ).submit();
return;
@@ -992,7 +992,7 @@ class LJ_API_Import {
if ( jQuery( '#' ).length ) {
jQuery( "# input[type='submit']" ).hide();
jQuery.ajaxSetup({'timeout':3600000});
- str = '
';
+ str = '
';
jQuery( '#' ).html( str );
jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer',
'step':jQuery('#step').val(),
diff --git a/wp-admin/includes/manifest.php b/wp-admin/includes/manifest.php
index 15ba7d6d1..cb36adf25 100644
--- a/wp-admin/includes/manifest.php
+++ b/wp-admin/includes/manifest.php
@@ -1,323 +1,324 @@
-registered as $script ) {
- if ( empty($script->src) ) continue;
- $ver = empty($script->ver) ? $wp_version : $script->ver;
- if ( 'editor' == $script->handle ) $mce_ver = $script->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
- $files[] = array($src, $ver);
- $man_ver .= $ver;
- }
-
- foreach ( $wp_styles->registered as $style ) {
- if ( empty($style->src) ) continue;
-
- $ver = empty($style->ver) ? $wp_version : $style->ver;
- $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
- if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
- $files[] = array($src, $ver);
- $man_ver .= $ver;
-
- if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
- if ( is_bool( $style->extra['rtl'] ) )
- $rtl_href = str_replace( '.css', '-rtl.css', $src );
- else
- $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
-
- $files[] = array($rtl_href, $ver);
- $man_ver .= $ver;
- }
- }
-
- $images = array(
- array('images/align-center.png'),
- array('images/align-left.png'),
- array('images/align-none.png'),
- array('images/align-right.png'),
- array('images/archive-link.png'),
- array('images/blue-grad.png'),
- array('images/browse-happy.gif'),
- array('images/bubble_bg.gif'),
- array('images/bubble_bg-rtl.gif'),
- array('images/button-grad.png'),
- array('images/button-grad-active.png'),
- array('images/comment-grey-bubble.png'),
- array('images/date-button.gif'),
- array('images/ed-bg.gif'),
- array('images/fade-butt.png'),
- array('images/fav.png'),
- array('images/fav-arrow.gif'),
- array('images/fav-arrow-rtl.gif'),
- array('images/fav-top.png'),
- array('images/generic.png'),
- array('images/gray-grad.png'),
- array('images/icons32.png'),
- array('images/icons32-vs.png'),
- array('images/list.png'),
- array('images/list-vs.png'),
- array('images/wpspin.gif'),
- array('images/logo.gif'),
- array('images/logo-ghost.png'),
- array('images/logo-login.gif'),
- array('images/media-button-image.gif'),
- array('images/media-button-music.gif'),
- array('images/media-button-other.gif'),
- array('images/media-button-video.gif'),
- array('images/menu.png'),
- array('images/menu-vs.png'),
- array('images/menu-arrows.gif'),
- array('images/menu-bits.gif'),
- array('images/menu-bits-rtl.gif'),
- array('images/menu-dark.gif'),
- array('images/menu-dark-rtl.gif'),
- array('images/no.png'),
- array('images/required.gif'),
- array('images/resize.gif'),
- array('images/screen-options-left.gif'),
- array('images/screen-options-right.gif'),
- array('images/screen-options-right-up.gif'),
- array('images/se.png'),
- array('images/star.gif'),
- array('images/toggle-arrow.gif'),
- array('images/toggle-arrow-rtl.gif'),
- array('images/white-grad.png'),
- array('images/white-grad-active.png'),
- array('images/wordpress-logo.png'),
- array('images/wp-logo.gif'),
- array('images/xit.gif'),
- array('images/yes.png'),
- array('../wp-includes/images/crystal/archive.png'),
- array('../wp-includes/images/crystal/audio.png'),
- array('../wp-includes/images/crystal/code.png'),
- array('../wp-includes/images/crystal/default.png'),
- array('../wp-includes/images/crystal/document.png'),
- array('../wp-includes/images/crystal/interactive.png'),
- array('../wp-includes/images/crystal/text.png'),
- array('../wp-includes/images/crystal/video.png'),
- array('../wp-includes/images/crystal/spreadsheet.png'),
- array('../wp-includes/images/rss.png'),
- array('../wp-includes/js/thickbox/loadingAnimation.gif'),
- array('../wp-includes/js/thickbox/tb-close.png'),
- );
-
- $files = array_merge($files, $images);
-
- if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
- $mce = array(
- array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true),
- array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver, true),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver, true),
-
- array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'),
- array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'),
- array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'),
- array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'),
- array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/flv_player.swf'),
- array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'),
- array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'),
- array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'),
- array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'),
- array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'),
- array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'),
- array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'),
- array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png')
- );
- $files = array_merge($files, $mce);
- endif;
-
- return $files;
-}
+registered as $script ) {
+ if ( empty($script->src) ) continue;
+ $ver = empty($script->ver) ? $wp_version : $script->ver;
+ if ( 'editor' == $script->handle ) $mce_ver = $script->ver;
+ $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src );
+ $files[] = array($src, $ver);
+ $man_ver .= $ver;
+ }
+
+ foreach ( $wp_styles->registered as $style ) {
+ if ( empty($style->src) ) continue;
+
+ $ver = empty($style->ver) ? $wp_version : $style->ver;
+ $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src );
+ if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css';
+ $files[] = array($src, $ver);
+ $man_ver .= $ver;
+
+ if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) {
+ if ( is_bool( $style->extra['rtl'] ) )
+ $rtl_href = str_replace( '.css', '-rtl.css', $src );
+ else
+ $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
+
+ $files[] = array($rtl_href, $ver);
+ $man_ver .= $ver;
+ }
+ }
+
+ $images = array(
+ array('images/align-center.png'),
+ array('images/align-left.png'),
+ array('images/align-none.png'),
+ array('images/align-right.png'),
+ array('images/archive-link.png'),
+ array('images/blue-grad.png'),
+ array('images/browse-happy.gif'),
+ array('images/bubble_bg.gif'),
+ array('images/bubble_bg-rtl.gif'),
+ array('images/button-grad.png'),
+ array('images/button-grad-active.png'),
+ array('images/comment-grey-bubble.png'),
+ array('images/date-button.gif'),
+ array('images/ed-bg.gif'),
+ array('images/fade-butt.png'),
+ array('images/fav.png'),
+ array('images/fav-arrow.gif'),
+ array('images/fav-arrow-rtl.gif'),
+ array('images/fav-top.png'),
+ array('images/generic.png'),
+ array('images/gray-grad.png'),
+ array('images/icons32.png'),
+ array('images/icons32-vs.png'),
+ array('images/list.png'),
+ array('images/list-vs.png'),
+ array('images/wpspin_light.gif'),
+ array('images/wpspin_dark.gif'),
+ array('images/logo.gif'),
+ array('images/logo-ghost.png'),
+ array('images/logo-login.gif'),
+ array('images/media-button-image.gif'),
+ array('images/media-button-music.gif'),
+ array('images/media-button-other.gif'),
+ array('images/media-button-video.gif'),
+ array('images/menu.png'),
+ array('images/menu-vs.png'),
+ array('images/menu-arrows.gif'),
+ array('images/menu-bits.gif'),
+ array('images/menu-bits-rtl.gif'),
+ array('images/menu-dark.gif'),
+ array('images/menu-dark-rtl.gif'),
+ array('images/no.png'),
+ array('images/required.gif'),
+ array('images/resize.gif'),
+ array('images/screen-options-left.gif'),
+ array('images/screen-options-right.gif'),
+ array('images/screen-options-right-up.gif'),
+ array('images/se.png'),
+ array('images/star.gif'),
+ array('images/toggle-arrow.gif'),
+ array('images/toggle-arrow-rtl.gif'),
+ array('images/white-grad.png'),
+ array('images/white-grad-active.png'),
+ array('images/wordpress-logo.png'),
+ array('images/wp-logo.gif'),
+ array('images/xit.gif'),
+ array('images/yes.png'),
+ array('../wp-includes/images/crystal/archive.png'),
+ array('../wp-includes/images/crystal/audio.png'),
+ array('../wp-includes/images/crystal/code.png'),
+ array('../wp-includes/images/crystal/default.png'),
+ array('../wp-includes/images/crystal/document.png'),
+ array('../wp-includes/images/crystal/interactive.png'),
+ array('../wp-includes/images/crystal/text.png'),
+ array('../wp-includes/images/crystal/video.png'),
+ array('../wp-includes/images/crystal/spreadsheet.png'),
+ array('../wp-includes/images/rss.png'),
+ array('../wp-includes/js/thickbox/loadingAnimation.gif'),
+ array('../wp-includes/js/thickbox/tb-close.png'),
+ );
+
+ $files = array_merge($files, $images);
+
+ if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
+ $mce = array(
+ array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true),
+ array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver, true),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver, true),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver, true),
+
+ array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'),
+ array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'),
+ array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'),
+ array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'),
+ array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/flv_player.swf'),
+ array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'),
+ array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'),
+ array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'),
+ array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'),
+ array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'),
+ array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'),
+ array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'),
+ array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png')
+ );
+ $files = array_merge($files, $mce);
+ endif;
+
+ return $files;
+}
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 217970bb0..3ff382a8d 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1514,7 +1514,7 @@ var addExtImage = {
t.resetImageData();
return false;
}
- document.getElementById('status_img').src = 'images/wpspin.gif';
+ document.getElementById('status_img').src = 'images/wpspin_light.gif';
t.preloadImg = new Image();
t.preloadImg.onload = t.updateImageData;
t.preloadImg.onerror = t.resetImageData;
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 972536cae..dfccb6e66 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -265,7 +265,7 @@ function inline_edit_term_row($type) {
-
+
@@ -1258,7 +1258,7 @@ function inline_edit_row( $type ) {
$update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' );
?>
-
+
@@ -2293,7 +2293,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
-
+
diff --git a/wp-admin/js/dashboard.dev.js b/wp-admin/js/dashboard.dev.js
index e8773c3e8..75d4521de 100644
--- a/wp-admin/js/dashboard.dev.js
+++ b/wp-admin/js/dashboard.dev.js
@@ -23,7 +23,7 @@ jQuery(document).ready( function($) {
quickPressLoad = function() {
var act = $('#quickpost-action'), t;
t = $('#quick-press').submit( function() {
- $('#dashboard_quick_press h3').append( '
' );
+ $('#dashboard_quick_press h3').append( '
' );
$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr('disabled','disabled');
if ( 'post' == act.val() ) {
diff --git a/wp-admin/js/dashboard.js b/wp-admin/js/dashboard.js
index d40b9fb98..8c20f1ecf 100644
--- a/wp-admin/js/dashboard.js
+++ b/wp-admin/js/dashboard.js
@@ -1 +1 @@
-jQuery(document).ready(function(c){var a,b,d;a=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];b=function(){c.each(a,function(){var f=jQuery("#"+this+":visible div.inside").find(".widget-loading");if(f.size()){f.parent().load("index-extra.php?jax="+this)}})};b();postboxes.add_postbox_toggles("dashboard",{onShow:b});d=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press h3").append('
');c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.serializeArray(),function(){c("#dashboard_quick_press h3 img").remove();c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");d()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};d()});
\ No newline at end of file
+jQuery(document).ready(function(c){var a,b,d;a=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];b=function(){c.each(a,function(){var f=jQuery("#"+this+":visible div.inside").find(".widget-loading");if(f.size()){f.parent().load("index-extra.php?jax="+this)}})};b();postboxes.add_postbox_toggles("dashboard",{onShow:b});d=function(){var e=c("#quickpost-action"),f;f=c("#quick-press").submit(function(){c("#dashboard_quick_press h3").append('
');c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==e.val()){e.val("post-quickpress-publish")}c("#dashboard_quick_press div.inside").load(f.attr("action"),f.serializeArray(),function(){c("#dashboard_quick_press h3 img").remove();c('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");c("#dashboard_quick_press ul").find("li").each(function(){c("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");d()});return false});c("#publish").click(function(){e.val("post-quickpress-publish")})};d()});
\ No newline at end of file
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 9747fa78a..be2795ba8 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -402,7 +402,7 @@ var ajaxurl = '';
return false;
break;
case 'photo' :
- jQuery('#extra_fields').before('
');
+ jQuery('#extra_fields').before('
');
jQuery.ajax({
type: "GET",
cache : false,
@@ -463,7 +463,7 @@ var ajaxurl = '';
-
+
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 3b407da74..4166380da 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -357,7 +357,7 @@ require_once( 'admin-header.php' ); ?>
+