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

Text Changes: Merge and clarify some permission error strings in the admin. 

See #38857.
Built from https://develop.svn.wordpress.org/trunk@39308


git-svn-id: http://core.svn.wordpress.org/trunk@39248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-11-19 01:38:31 +00:00
parent 529e242a39
commit b1ed607578
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/edit-tags.php
View File

@ -18,13 +18,13 @@ if ( ! $tax )
wp_die( __( 'Invalid taxonomy.' ) );
if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
wp_die( __( 'Sorry, you are not allowed to manage these items.' ) );
wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
}
if ( ! current_user_can( $tax->cap->manage_terms ) ) {
wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
403
);
}
@ -74,7 +74,7 @@ case 'add-tag':
if ( ! current_user_can( $tax->cap->edit_terms ) ) {
wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
403
);
}

2
wp-admin/options.php
View File

@ -47,7 +47,7 @@ if ( empty($option_page) ) {
if ( ! current_user_can( $capability ) ) {
wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
'<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</p>',
403
);
}

4
wp-admin/users.php
View File

@ -94,7 +94,7 @@ case 'promote':
check_admin_referer('bulk-users');
if ( ! current_user_can( 'promote_users' ) )
wp_die( __( 'Sorry, you are not allowed to edit that user.' ) );
wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
if ( empty($_REQUEST['users']) ) {
wp_redirect($redirect);
@ -119,7 +119,7 @@ case 'promote':
$id = (int) $id;
if ( ! current_user_can('promote_user', $id) )
wp_die(__('Sorry, you are not allowed to edit that user.'));
wp_die(__('Sorry, you are not allowed to edit this user.'));
// The new role of the current user must also have the promote_users cap or be a multisite super admin
if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users')
&& ! ( is_multisite() && is_super_admin() ) ) {

2
wp-includes/version.php
View File

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