mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-14 17:09:47 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Customize: Correct the capability mapping and associated tests for the unfiltered_css capability.

Browse Source 
Fixes #35395


git-svn-id: https://develop.svn.wordpress.org/trunk@39016 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2016-10-30 12:46:46 +00:00
parent db6994c8c6
commit 4e262ff6ee
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/capabilities.php
View File

@ -320,6 +320,7 @@ function map_meta_cap( $cap, $user_id ) {
else
$caps[] = 'do_not_allow';
break;
case 'unfiltered_css' :
case 'unfiltered_html' :
// Disallow unfiltered_html for all users, even admins and super admins.
if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
@ -327,10 +328,7 @@ function map_meta_cap( $cap, $user_id ) {
elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
else
$caps[] = $cap;
break;
case 'unfiltered_css' :
$caps[] = 'unfiltered_html';
$caps[] = 'unfiltered_html';
break;
case 'edit_files':
case 'edit_plugins':

3
tests/phpunit/tests/user/capabilities.php
View File

@ -229,6 +229,7 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'manage_post_tags' => array( 'administrator', 'editor' ),
'edit_post_tags' => array( 'administrator', 'editor' ),
'delete_post_tags' => array( 'administrator', 'editor' ),
'unfiltered_css' => array( 'administrator', 'editor' ),
'assign_categories' => array( 'administrator', 'editor', 'author', 'contributor' ),
'assign_post_tags' => array( 'administrator', 'editor', 'author', 'contributor' ),
@ -247,6 +248,7 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
'manage_network_options' => array(),
'upload_plugins' => array(),
'upload_themes' => array(),
'unfiltered_css' => array(),
'customize' => array( 'administrator' ),
'delete_site' => array( 'administrator' ),
@ -391,7 +393,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
// These primitive capabilities have a 'case' in `map_meta_cap()` but aren't meta capabilities:
$expected['unfiltered_upload'],
$expected['unfiltered_html'],
$expected['unfiltered_css'],
$expected['edit_files'],
$expected['edit_plugins'],
$expected['edit_themes'],