<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42648] trunk/src: General: Replace `Cheatin?\226?\128?\153 uh?` with friendlier error messages.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42648">42648</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42648","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-05 02:29:53 +0000 (Mon, 05 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>General: Replace `Cheatin?\226?\128?\153 uh?` with friendlier error messages.
While intended as a playful error message, `Cheatin?\226?\128?\153 uh?` can be interpreted as insulting or accusatory in an already stressful situation. This replaces Cheatin?\226?\128?\153 with more meaningful error messages, depending on the error that occurs.
Props ElectricFeet, EricMeyer, karmatosed, dd32, BandonRandon, melchoyce for language; dmsnell for original patch; peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/38332">#38332</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpostnewphp">trunk/src/wp-admin/post-new.php</a></li>
<li><a href="#trunksrcwpadminpressthisphp">trunk/src/wp-admin/press-this.php</a></li>
<li><a href="#trunksrcwpadmintermphp">trunk/src/wp-admin/term.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesjswpajaxresponsejs">trunk/src/wp-includes/js/wp-ajax-response.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-header.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/custom-header.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,7 +758,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'custom-header-upload', '_wpnonce-custom-header-upload' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -922,7 +922,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,7 +930,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/customize.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'customize' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'This changeset cannot be further modified.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/edit-comments.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_posts' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/edit-tags.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $tax->cap->manage_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $tax->cap->edit_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $tax->cap->delete_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/edit.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/includes/bookmark.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function edit_link( $link_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_links' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/includes/file.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +591,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $result['message'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = __( 'An unidentified error has occurred.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'An error has occurred.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $result['message'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $result['message'] );
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/js/customize-controls.js 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6836,7 +6836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> cheatin: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( document.body ).empty().addClass( 'cheatin' ).append(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' + api.l10n.cheatin + '</h1>' +
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' + api.l10n.notAllowedHeading + '</h1>' +
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' + api.l10n.notAllowed + '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="trunksrcwpadminmediauploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/media-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-upload.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/media-upload.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an ID for the edit screen.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $action ) && $action == 'edit' && ! $ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Invalid item ID.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post', $_REQUEST['post_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/nav-menus.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Permissions Check
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/network/site-users.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user doesn't already belong to the blog, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_member_of_blog( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/options.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $capability ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update' != $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminpostnewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/post-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post-new.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/post-new.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminpressthisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/press-this.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/press-this.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Sorry, you are not allowed to create posts as this user.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Cheatin’ uh?' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You don’t have permission to do this.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_plugin_active( $plugin_file ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmintermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/term.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/term.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ! current_user_can( 'edit_term', $tag->term_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/themes.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $theme->exists() || ! $theme->is_allowed() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $theme->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/user-new.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,14 +12,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! current_user_can( 'create_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'create_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/users.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'list_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to list users.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user doesn't already belong to the blog, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'An error has occurred.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-admin/widgets.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $message ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = __( 'Cheatin’ uh?' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'An error has occurred.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->messenger_channel ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,7 +512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> auth_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h1>' . __( 'You don’t have permission to do this.' ) . '</h1>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 403
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3879,7 +3879,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_ID ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'An unidentified error has occurred.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'An error has occurred.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-includes/functions.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2718,7 +2718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_logout_url( $redirect_to )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = __( 'Are you sure you want to do this?' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = __( 'The link you followed no longer exists.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp_get_referer() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= '</p><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2729,7 +2729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( $html, __( 'An error has occurred.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjswpajaxresponsejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wp-ajax-response.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-ajax-response.js 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-includes/js/wp-ajax-response.js 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> selector = jQuery( selector );
</span><span class="cx" style="display: block; padding: 0 10px"> return !wpAjax.invalidateForm( selector.find('.form-required').filter( function() { return jQuery('input:visible', this).val() === ''; } ) ).length;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}, wpAjax || { noPerm: 'Sorry, you are not allowed to do that.', broken: 'An unidentified error has occurred.' } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}, wpAjax || { noPerm: 'Sorry, you are not allowed to do that.', broken: 'An error has occurred.' } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Basic form validation
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready( function($){
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2018-02-04 16:04:10 UTC (rev 42647)
+++ trunk/src/wp-includes/script-loader.php 2018-02-05 02:29:53 UTC (rev 42648)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-ajax-response', 'wpAjax', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'broken' => __( 'An unidentified error has occurred.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'broken' => __( 'An error has occurred.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'close' => __( 'Close' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => __( 'Action' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'discardChanges' => __( 'Discard changes' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cheatin' => __( 'Cheatin’ uh?' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cheatin' => __( 'An error has occurred.' ),
+ 'notAllowedHeading' => __( 'You don’t have permission to do this.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'notAllowed' => __( 'Sorry, you are not allowed to customize this site.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'previewIframeTitle' => __( 'Site Preview' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'loginIframeTitle' => __( 'Session expired' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,7 +689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin-tags', 'tagsl10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'broken' => __( 'An unidentified error has occurred.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'broken' => __( 'An error has occurred.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +918,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateImporter' => __( 'Run Importer' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Importer name */
</span><span class="cx" style="display: block; padding: 0 10px"> 'activateImporterLabel' => __( 'Run %s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'unknownError' => __( 'An unidentified error has occurred.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'unknownError' => __( 'An error has occurred.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound' => __( 'Number of plugins found: %d' ),
</span></span></pre>
</div>
</div>
</body>
</html>