Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

After [31037], ensure that the library is passed as a map to the Media Grid instance. Remove useless query vars. 

Fixes #30584.

Built from https://develop.svn.wordpress.org/trunk@31041


git-svn-id: http://core.svn.wordpress.org/trunk@31022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-04 02:07:23 +00:00
parent de4d970d77
commit ada7442b9e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/upload.php
View File

@ -26,11 +26,16 @@ if ( 'grid' === $mode ) {
wp_enqueue_script( 'media' );
$vars = wp_edit_attachments_query_vars();
unset( $vars['mode'], $vars['post_type'], $vars['post_status'], $vars['posts_per_page'] );
$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
foreach ( $vars as $key => $value ) {
if ( ! $value || in_array( $key, $ignore ) ) {
unset( $vars[ $key ] );
}
}
wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
'queryVars' => $vars
'queryVars' => (object) $vars
) );
get_current_screen()->add_help_tab( array(

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31040';
$wp_version = '4.2-alpha-31041';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.