Index: tags/4.0/src/wp-admin/includes/image.php
===================================================================
--- tags/4.0.1/src/wp-admin/includes/image.php (revision 46222)
+++ tags/4.0/src/wp-admin/includes/image.php (revision 46222)
@@ -402,10 +402,4 @@
}
- foreach ( $meta as &$value ) {
- if ( is_string( $value ) ) {
- $value = wp_kses_post( $value );
- }
- }
-
/**
* Filter the array of meta data read from an image's exif data.
Index: tags/4.0/src/wp-admin/includes/plugin-install.php
===================================================================
--- tags/4.0.1/src/wp-admin/includes/plugin-install.php (revision 46222)
+++ tags/4.0/src/wp-admin/includes/plugin-install.php (revision 46222)
@@ -236,13 +236,8 @@
global $wp_list_table;
- if ( current_filter() == 'install_plugins_favorites' && empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
- return;
- }
-
- ?>
-
- display();
}
add_action( 'install_plugins_search', 'display_plugins_table' );
Index: tags/4.0/src/wp-admin/includes/post.php
===================================================================
--- tags/4.0.1/src/wp-admin/includes/post.php (revision 46222)
+++ tags/4.0/src/wp-admin/includes/post.php (revision 46222)
@@ -1206,16 +1206,10 @@
}
} else {
- if ( function_exists( 'mb_strlen' ) ) {
- if ( mb_strlen( $post_name ) > 30 ) {
- $post_name_abridged = mb_substr( $post_name, 0, 14 ) . '…' . mb_substr( $post_name, -14 );
- } else {
- $post_name_abridged = $post_name;
- }
+ if ( function_exists( 'mb_strlen' ) && mb_strlen( $post_name ) > 30 ) {
+ $post_name_abridged = mb_substr( $post_name, 0, 14 ) . '…' . mb_substr( $post_name, -14 );
+ } elseif ( strlen( $post_name ) > 30 ) {
+ $post_name_abridged = substr( $post_name, 0, 14 ) . '…' . substr( $post_name, -14 );
} else {
- if ( strlen( $post_name ) > 30 ) {
- $post_name_abridged = substr( $post_name, 0, 14 ) . '…' . substr( $post_name, -14 );
- } else {
- $post_name_abridged = $post_name;
- }
+ $post_name_abridged = $post_name;
}
Index: tags/4.0/src/wp-admin/js/editor-expand.js
===================================================================
--- tags/4.0.1/src/wp-admin/js/editor-expand.js (revision 46222)
+++ tags/4.0/src/wp-admin/js/editor-expand.js (revision 46222)
@@ -3,5 +3,5 @@
window.wp = window.wp || {};
-jQuery( document ).ready( function( $ ) {
+jQuery( document ).ready( function($) {
var $window = $( window ),
$document = $( document ),
@@ -149,9 +149,4 @@
// We need to wait for TinyMCE to initialize.
$document.on( 'tinymce-editor-init.editor-expand', function( event, editor ) {
- var hideFloatPanels = _.debounce( function() {
- ! $( '.mce-floatpanel:hover' ).length && tinymce.ui.FloatPanel.hideAll();
- $( '.mce-tooltip' ).hide();
- }, 1000, true );
-
// Make sure it's the main editor.
if ( editor.id !== 'content' ) {
@@ -230,6 +225,4 @@
// Adjust when switching editor modes.
function mceShow() {
- $window.on( 'scroll.mce-float-panels', hideFloatPanels );
-
setTimeout( function() {
editor.execCommand( 'wpAutoResize' );
@@ -239,6 +232,4 @@
function mceHide() {
- $window.off( 'scroll.mce-float-panels' );
-
setTimeout( function() {
var top = $contentWrap.offset().top;
@@ -261,6 +252,4 @@
// Adjust when the editor resizes.
editor.on( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
-
- $window.off( 'scroll.mce-float-panels' ).on( 'scroll.mce-float-panels', hideFloatPanels );
};
@@ -270,6 +259,4 @@
editor.off( 'hide', mceHide );
editor.off( 'setcontent wp-autoresize wp-toolbar-toggle', adjust );
-
- $window.off( 'scroll.mce-float-panels' );
};
@@ -604,10 +591,4 @@
adjust();
- }).on( 'wp-window-resized.editor-expand', function() {
- if ( mceEditor && ! mceEditor.isHidden() ) {
- mceEditor.execCommand( 'wpAutoResize' );
- } else {
- textEditorResize();
- }
});
Index: tags/4.0/src/wp-admin/js/media.js
===================================================================
--- tags/4.0.1/src/wp-admin/js/media.js (revision 46222)
+++ tags/4.0/src/wp-admin/js/media.js (revision 46222)
@@ -73,13 +73,9 @@
$( document ).ready( function() {
- var $mediaGridWrap = $( '#wp-media-grid' );
-
// Open up a manage media frame into the grid.
- if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
- window.wp.media({
- frame: 'manage',
- container: $mediaGridWrap
- }).open();
- }
+ wp.media && wp.media({
+ frame: 'manage',
+ container: $('#wpbody-content > .wrap')
+ }).open();
$( '#find-posts-submit' ).click( function( event ) {
Index: tags/4.0/src/wp-admin/plugin-install.php
===================================================================
--- tags/4.0.1/src/wp-admin/plugin-install.php (revision 46222)
+++ tags/4.0/src/wp-admin/plugin-install.php (revision 46222)
@@ -25,24 +25,5 @@
$wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
$pagenum = $wp_list_table->get_pagenum();
-
-if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
- $location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-
- if ( ! empty( $_REQUEST['paged'] ) ) {
- $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
- }
-
- wp_redirect( $location );
- exit;
-}
-
$wp_list_table->prepare_items();
-
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
- wp_redirect( add_query_arg( 'paged', $total_pages ) );
- exit;
-}
$title = __( 'Add Plugins' );
Index: tags/4.0/src/wp-admin/press-this.php
===================================================================
--- tags/4.0.1/src/wp-admin/press-this.php (revision 46222)
+++ tags/4.0/src/wp-admin/press-this.php (revision 46222)
@@ -64,5 +64,5 @@
if ( is_wp_error($upload) ) {
wp_delete_post($post_ID);
- wp_die( esc_html( $upload->get_error_message() ) );
+ wp_die($upload);
} else {
// Post formats.
Index: tags/4.0/src/wp-admin/upload.php
===================================================================
--- tags/4.0.1/src/wp-admin/upload.php (revision 46222)
+++ tags/4.0/src/wp-admin/upload.php (revision 46222)
@@ -58,5 +58,5 @@
require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
-