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

REST API: Capability check for editing a single term should use the singular form. 

As an extra level of sanity checking, the term ID should be cast as an int in `map_meta_cap()`.

Merge of [39464] to the 4.7 branch.

Props johnbillion, nacin, dd32, pento.
See #35614.
Fixes #39012.


Built from https://develop.svn.wordpress.org/branches/4.7@39465


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2016-12-03 05:09:32 +00:00
parent dae13be262
commit ea244bef6e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/capabilities.php
View File

@ -427,7 +427,7 @@ function map_meta_cap( $cap, $user_id ) {
case 'edit_term': case 'edit_term':
case 'delete_term': case 'delete_term':
case 'assign_term': case 'assign_term':
$term_id = $args[0]; $term_id = (int) $args[0];
$term = get_term( $term_id ); $term = get_term( $term_id );
if ( ! $term || is_wp_error( $term ) ) { if ( ! $term || is_wp_error( $term ) ) {
$caps[] = 'do_not_allow'; $caps[] = 'do_not_allow';

6
wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
View File

@ -288,7 +288,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
} }
/** /**
* Checks if a request has access to read the specified term. * Checks if a request has access to read or edit the specified term.
* *
* @since 4.7.0 * @since 4.7.0
* @access public * @access public
@ -301,8 +301,8 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
if ( ! $tax_obj || ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) { if ( ! $tax_obj || ! $this->check_is_taxonomy_allowed( $this->taxonomy ) ) {
return false; return false;
} }
if ( 'edit' === $request['context'] && ! current_user_can( $tax_obj->cap->edit_terms ) ) { if ( 'edit' === $request['context'] && ! current_user_can( 'edit_term', (int) $request['id'] ) ) {
return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), array( 'status' => rest_authorization_required_code() ) ); return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to edit this term.' ), array( 'status' => rest_authorization_required_code() ) );
} }
return true; return true;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-RC1-39463'; $wp_version = '4.7-RC1-39465';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.