From 771b29455bbd05f9fdec3afacc6ee855f06770b4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 3 Sep 2015 08:59:24 +0000
Subject: [PATCH] Provide more helpful feedback than just "Cheatin' uh?" for
 permission errors in `wp-admin/includes/bookmark.php`.

props ericlewis, kraftbj, lukecarbis, mrmist.
fixes #33682. see #14530.
Built from https://develop.svn.wordpress.org/trunk@33887


git-svn-id: http://core.svn.wordpress.org/trunk@33856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/bookmark.php | 9 +++++++--
 wp-includes/version.php        | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index bdf1d7fa40..486ae835be 100644
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -26,8 +26,13 @@ function add_link() {
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
 function edit_link( $link_id = 0 ) {
-	if ( !current_user_can( 'manage_links' ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+	if ( ! current_user_can( 'manage_links' ) ) {
+		wp_die(
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<p>' . __( 'You do not have sufficient permissions to edit the links for this site.' ) . '</p>',
+			403
+		);
+	}
 
 	$_POST['link_url'] = esc_html( $_POST['link_url'] );
 	$_POST['link_url'] = esc_url($_POST['link_url']);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b774423c2b..473213cacd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33886';
+$wp_version = '4.4-alpha-33887';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.