Media Grid: Ignore user setting for `content`.

fixes #29034.
Built from https://develop.svn.wordpress.org/trunk@29305


git-svn-id: http://core.svn.wordpress.org/trunk@29087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2014-07-27 11:44:18 +00:00
parent abbe1d0383
commit ab151eca85
3 changed files with 8 additions and 8 deletions

View File

@ -139,12 +139,12 @@
// Add the default states.
this.states.add([
new media.controller.Library({
library: media.query( options.library ),
multiple: options.multiple,
title: options.title,
content: 'browse',
filterable: 'mime-types'
library: media.query( options.library ),
multiple: options.multiple,
title: options.title,
content: 'browse',
contentUserSetting: false,
filterable: 'mime-types'
})
]);
},

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.0-beta2-20140726';
$wp_version = '4.0-beta2-20140727';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.