Changeset 33852

Timestamp:

09/02/2015 04:05:07 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Provide more helful feedback than just “Cheatin’ uh?” for permission errors in wp-admin/edit-tags.php.

props ericlewis, kraftbj, lukecarbis, mrmist.
fixes #33670. see #14530.

File:

• trunk/src/wp-admin/edit-tags.php (modified) (6 diffs)

trunk/src/wp-admin/edit-tags.php

@@ -18 +18 @@
     wp_die( __( 'Invalid taxonomy' ) );
 
-if ( ! current_user_can( $tax->cap->manage_terms ) )
-    wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can( $tax->cap->manage_terms ) ) {
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
+        403
+    );
+}
 
 /**
@@ -54 +59 @@
     check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
-    if ( !current_user_can( $tax->cap->edit_terms ) )
-        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+    if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'You are not allowed to add this item.' ) . '</p>',
+            403
+        );
+    }
 
     $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
@@ -90 +100 @@
     check_admin_referer( 'delete-tag_' . $tag_ID );
 
-    if ( !current_user_can( $tax->cap->delete_terms ) )
-        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+    if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
+            403
+        );
+    }
 
     wp_delete_term( $tag_ID, $taxonomy );
@@ -102 +117 @@
     check_admin_referer( 'bulk-tags' );
 
-    if ( !current_user_can( $tax->cap->delete_terms ) )
-        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+    if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
+            403
+        );
+    }
 
     $tags = (array) $_REQUEST['delete_tags'];
@@ -140 +160 @@
     check_admin_referer( 'update-tag_' . $tag_ID );
 
-    if ( !current_user_can( $tax->cap->edit_terms ) )
-        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+    if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
+            403
+        );
+    }
 
     $tag = get_term( $tag_ID, $taxonomy );
@@ -253 +278 @@
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( !current_user_can($tax->cap->edit_terms) )
-    wp_die( __('You are not allowed to edit this item.') );
+if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
+        403
+    );
+}
 
 $messages = array();