<!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>[37914] trunk: Text Changes: Unify permission 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/37914">37914</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/37914","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-29 15:15:40 +0000 (Wed, 29 Jun 2016)</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'>Text Changes: Unify permission error messages.
The new format looks like "Sorry, you are not allowed to <action>.". This provides a consistent experience for all error messages related to missing permissions. It also reduces the number of similar strings and allows translators to provide a consistent style in their language.
Props ramiy, Presskopp.
Fixes <a href="https://core.trac.wordpress.org/ticket/34521">#34521</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<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="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminlinkaddphp">trunk/src/wp-admin/link-add.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminmedianewphp">trunk/src/wp-admin/media-new.php</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworkindexphp">trunk/src/wp-admin/network/index.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionsmediaphp">trunk/src/wp-admin/options-media.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostnewphp">trunk/src/wp-admin/post-new.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.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="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.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="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpdeleteTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditCommentphp">trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpeditTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTaxonomyphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetTermsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpnewTermphp">trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminphp"></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/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/admin.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $importer = $_GET['import'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('import') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You are not allowed to import.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to import.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( validate_file($importer) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
</span></span></pre></div>
<a id="trunksrcwpadminasyncuploadphp"></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/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/async-upload.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,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 ( ! current_user_can( 'upload_files' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to upload files.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
</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"> // just fetch the detail form for that attachment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' != $post->post_type )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this item.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $_REQUEST['fetch'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 3 :
</span></span></pre></div>
<a id="trunksrcwpadmincommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/comment.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
</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_comment', $comment_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- comment_footer_die( __('You are not allowed to edit this comment.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'trash' == $comment->comment_approved )
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$comment = get_comment($comment_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- comment_footer_die( __('You are not allowed to edit comments on this post.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
</span><span class="cx" style="display: block; padding: 0 10px"> $redir = wp_get_referer();
</span></span></pre></div>
<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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/custom-header.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,7 +966,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('edit_theme_options') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have permission to customize headers.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to customize headers.'));
</ins><span class="cx" style="display: block; padding: 0 10px"> $step = $this->step();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 2 == $step )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->step_2();
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/customize.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to customize this site.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/edit-comments.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> if ( ! current_user_can( 'edit_posts' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit comments.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error_msg = __( 'Invalid comment ID.' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 2 :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error_msg = __( 'You are not allowed to edit comments on this post.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error_msg )
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/edit-tags.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +18,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid taxonomy' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to manage these items.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage these items.' ) );
</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 ( ! current_user_can( $tax->cap->manage_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to add this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
</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"> }
</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"> if ( ! current_user_can( $tax->cap->delete_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/edit.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
</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 ( 'attachment' === $typenow ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit posts in this post type.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to move this item to the Trash.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_check_post_lock( $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locked++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $untrashed = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to restore this item from the Trash.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_untrash_post($post_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __('Error in restoring from Trash.') );
</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"> $post_del = get_post($post_id);
</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_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to delete this item.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to delete this item.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_del->post_type == 'attachment' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_delete_attachment($post_id) )
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/export.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('export') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to export the content of this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to export the content of this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress export API */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/export.php' );
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/import.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('import') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to import content in this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to import content in this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Import');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1622,10 +1622,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $_POST['post_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_page', $post_ID ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_ID ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</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 ( $last = wp_check_post_lock( $post_ID ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2020,7 +2020,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message' => __( 'You do not have permission to upload files.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => __( 'Sorry, you are not allowed to upload files.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filename' => $_FILES['async-upload']['name'],
</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">@@ -3302,7 +3302,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 ( ! current_user_can( 'install_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to install themes on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to install themes on this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3398,7 +3398,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 ( ! current_user_can( 'update_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to update themes on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to update themes on this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3476,7 +3476,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 ( ! current_user_can( 'delete_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to delete themes on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to delete themes on this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3540,7 +3540,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 ( ! current_user_can( 'install_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to install plugins on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to install plugins on this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3638,7 +3638,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 ( ! current_user_can( 'update_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to update plugins for this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to update plugins for this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3727,7 +3727,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 ( ! current_user_can( 'delete_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to delete plugins for this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to delete plugins for this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3787,7 +3787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_list_table->ajax_user_can() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to manage plugins on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to manage plugins for this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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">@@ -3827,7 +3827,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_list_table->ajax_user_can() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status['errorMessage'] = __( 'You do not have sufficient permissions to manage plugins on this site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status['errorMessage'] = __( 'Sorry, you are not allowed to manage plugins on this site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $status );
</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="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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/bookmark.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You do not have sufficient permissions to edit the links for this site.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,5 +312,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
</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( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/comment.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/comment.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> function edit_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['newcomment_author'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['comment_author'] = $_POST['newcomment_author'];
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/media.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3121,7 +3121,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 ( ! current_user_can( 'edit_post', $parent_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_REQUEST['media'] as $att_id ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/menu.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/menu.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_page_access_denied' );
</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( __( 'You do not have sufficient permissions to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 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"> $menu = add_menu_classes($menu);
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/includes/post.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,14 +30,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
</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 ( isset( $post_data['content'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,14 +68,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
</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">@@ -210,9 +210,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype = get_post_type_object($post_data['post_type']);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'edit_post', $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to edit this page.' ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to edit this page.' ));
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to edit this post.' ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to edit this post.' ));
</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 ( post_type_supports( $ptype->name, 'revisions' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,9 +428,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( $ptype->cap->edit_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $ptype->name )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to edit pages.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to edit pages.'));
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You are not allowed to edit posts.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to edit posts.'));
</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 ( -1 == $post_data['_status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,9 +721,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( $ptype->cap->edit_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $ptype->name )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
</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"> $_POST['post_mime_type'] = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1724,11 +1724,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['ID'] = $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post = get_post( $post_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</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 ( ! current_user_can( 'edit_post', $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</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"> $is_autosave = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,7 +1786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</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_post', $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
</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 ( 'auto-draft' == $post->post_status )
</span></span></pre></div>
<a id="trunksrcwpadminlinkaddphp"></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/link-add.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-add.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/link-add.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('manage_links') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to add links to this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to add links to this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Add New Link');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'link-manager.php';
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></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/link-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/link-manager.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Administration Bootstrap */
</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( 'manage_links' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_Links_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('manage_links') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__("You do not have sufficient permissions to edit the links for this site."));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
</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="trunksrcwpadminmedianewphp"></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-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-new.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/media-new.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,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">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!current_user_can('upload_files'))
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have permission to upload files.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to upload files.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script('plupload-handlers');
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/media-upload.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'upload_files' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to upload files.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to upload files.' ), 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"> wp_enqueue_script('plupload-handlers');
</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"> 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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/media.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('media-form');
</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_post', $attachment_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die ( __('You are not allowed to edit this attachment.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = media_upload_form_handler();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $att_id = (int) $_GET['attachment_id'];
</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_post', $att_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die ( __('You are not allowed to edit this attachment.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $att = get_post($att_id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></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/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/ms-delete-site.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Multisite support is not enabled.' ) );
</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_site' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__( 'You do not have sufficient permissions to delete this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__( 'Sorry, you are not allowed to delete this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></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/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/my-sites.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('read') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/nav-menus.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> if ( ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminnetworkindexphp"></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/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/index.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/index.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Dashboard' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'index.php';
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></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/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/settings.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Network Settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'settings.php';
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></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-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/site-info.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,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 ( ! current_user_can( 'manage_sites' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
</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"> get_current_screen()->add_help_tab( array(
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! can_edit_network( $details->site_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 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"> $parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></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-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/site-new.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></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-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/site-settings.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to edit this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,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 ( !can_edit_network( $details->site_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_main_site = is_main_site( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></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-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/site-themes.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,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 ( !can_edit_network( $details->site_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_main_site = is_main_site( $id );
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/site-users.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('manage_sites') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to edit this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to edit this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_Users_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->prepare_items();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,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 ( ! can_edit_network( $details->site_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_main_site = is_main_site( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></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/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/sites.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum = $wp_list_table->get_pagenum();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,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 ( $current_site->blog_id == $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to change the current site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
</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"> $site_details = get_blog_details( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deleteblog':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_sites' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_action = 'not_deleted';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_site', $val ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to delete the site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to delete the site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_action = 'all_delete';
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $val, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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">- wp_die( __( 'You are not allowed to change the current site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Site deleted.' );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'not_deleted':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = __( 'You do not have permission to delete that site.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = __( 'Sorry, you are not allowed to delete that site.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'archiveblog':
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'Site archived.' );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/themes.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('manage_network_themes') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum = $wp_list_table->get_pagenum();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete-selected':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
</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"> check_admin_referer( 'bulk-themes' );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/upgrade.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/upgrade.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/user-new.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to add users to this network.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to add users to this network.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</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"> check_admin_referer( 'add-user', '_wpnonce_add-user' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $_POST['user'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Cannot create an empty user.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network/users.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['action'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/edit.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $_GET['action'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deleteuser':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_network_users' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'deleteuser' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'allusers':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'manage_network_users' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-users-network' );
</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"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_users' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'users.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'dodelete':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'ms-users-delete' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to access this page.' ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_POST['blog'] as $id => $users ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/network.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_super_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</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 ( is_multisite() ) {
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-discussion.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Discussion Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-general.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('General Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunksrcwpadminoptionsmediaphp"></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-media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-media.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-media.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Media Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></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-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-permalink.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Permalink Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></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-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-reading.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Reading Settings' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></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-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options-writing.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __('Writing Settings');
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'options-general.php';
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/options.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> if ( ! current_user_can( $capability ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
</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"> }
</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"> if ( is_multisite() && ! is_super_admin() && 'update' != $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'options' == $option_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_super_admin() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $whitelist_options[ $option_page ];
</span></span></pre></div>
<a id="trunksrcwpadminplugineditorphp"></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/plugin-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/plugin-editor.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,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 ( !current_user_can('edit_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to edit plugins for this site.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __("Edit Plugins");
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'plugins.php';
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/plugin-install.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('install_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( 'plugin-install.php' ) );
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/plugins.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to manage plugins for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_Plugins_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum = $wp_list_table->get_pagenum();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'activate':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'activate-selected':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('bulk-plugins');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'error_scrape':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('plugin-activation-error_' . $plugin);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deactivate':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('deactivate-plugin_' . $plugin);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'deactivate-selected':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('activate_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('bulk-plugins');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete-selected':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('delete_plugins') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to delete plugins for this site.'));
</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"> check_admin_referer('bulk-plugins');
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/post-new.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> 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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/post.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,11 +110,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
</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 ( ! current_user_can( 'edit_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to edit this item.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'trash' == $post->post_status )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown post type.' ) );
</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_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id = wp_check_post_lock( $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown post type.' ) );
</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_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_untrash_post( $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error in restoring from Trash.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Unknown post type.' ) );
</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_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to delete this item.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post->post_type == 'attachment' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $force = ( ! MEDIA_TRASH );
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/press-this.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> 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"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/term.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to manage this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to manage this item.' ) . '</p>',
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></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/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/theme-editor.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,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 ( !current_user_can('edit_themes') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __("Edit Themes");
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'themes.php';
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/theme-install.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_reset_vars( array( 'tab' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('install_themes') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( 'theme-install.php' ) );
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/themes.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> 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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
</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"> }
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/update-core.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,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 ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</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">@@ -623,7 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_core' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-core');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'do-plugin-upgrade' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-core');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'do-theme-upgrade' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-core');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'do-translation-upgrade' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'upgrade-translations' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/update.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'update-selected' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-update-plugins' );
</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"> } elseif ( 'upgrade-plugin' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('update_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-plugin_' . $plugin);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ('activate-plugin' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('update_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('activate-plugin_' . $plugin);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'install-plugin' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('install_plugins') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
</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"> } elseif ( 'upload-plugin' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'upload_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
</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"> check_admin_referer('plugin-upload');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'upgrade-theme' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('update_themes') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have sufficient permissions to update themes for this site.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to update themes for this site.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('upgrade-theme_' . $theme);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include(ABSPATH . 'wp-admin/admin-footer.php');
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'update-selected-themes' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-update-themes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'install-theme' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('install_themes') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'upload-theme' == $action ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'upload_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
</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"> check_admin_referer('theme-upload');
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></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/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/upload.php 2016-06-29 15:15:40 UTC (rev 37914)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('upload_files') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You do not have permission to upload files.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
</span><span class="cx" style="display: block; padding: 0 10px"> $modes = array( 'grid', 'list' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_trash_post( $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error in moving to Trash.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to move this item out of the Trash.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_untrash_post( $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error in restoring from Trash.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id_del ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id_del ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'You are not allowed to delete this item.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_delete_attachment( $post_id_del ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error in deleting.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/user-edit.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && $user_id != $current_user->ID
</span><span class="cx" style="display: block; padding: 0 10px"> && ! apply_filters( 'enable_edit_any_user_configuration', true )
</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( __( 'You do not have permission to edit this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
</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"> // Execute confirmed email change. See send_confirmation_on_profile_email().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('update-user_' . $user_id);
</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_user', $user_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have permission to edit this user.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to edit this user.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( IS_PROFILE_PAGE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $profileuser = get_user_to_edit($user_id);
</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_user', $user_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die(__('You do not have permission to edit this user.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(__('Sorry, you are not allowed to edit this user.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/user-new.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,14 +13,14 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
</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"> }
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to create users.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to create users.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/users.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to browse users.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to browse users.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-admin/widgets.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
</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"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> show_admin_bar( false );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_die( -1, __( 'You are not allowed to customize this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_die( -1, __( 'Sorry, you are not allowed to customize this site.' ) );
</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"> $this->original_stylesheet = get_stylesheet();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the requested theme is not the active theme and the user doesn't have the
</span><span class="cx" style="display: block; padding: 0 10px"> // switch_themes cap, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'switch_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->wp_die( -1, __( 'You are not allowed to edit theme options on this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
</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 the theme has errors while loading, bail.
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1340,7 +1340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_author'] = absint( $post_data['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = get_userdata( $post_data['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1634,7 +1634,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 ( ! current_user_can( 'delete_post', $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
</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"> $result = wp_delete_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1792,7 +1792,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 ( ! current_user_can( $post_type->cap->edit_posts ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to edit posts in this post type.' ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query['post_type'] = $post_type->name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1875,7 +1875,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->manage_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to create terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = (array) $taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1962,7 +1962,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $content_struct['taxonomy'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->edit_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to edit terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = (array) $taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2058,7 +2058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id, $taxonomy->name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2129,7 +2129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id , $taxonomy->name, ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2187,7 +2187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2282,7 +2282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_taxonomy( $taxonomy, $fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2470,7 +2470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getUsers' );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to browse users.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to browse users.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = array( 'fields' => 'all_with_meta' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2794,7 +2794,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the user can delete pages.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('delete_page', $page_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this page.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to delete the page.
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_delete_post($page_id);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2856,7 +2856,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the user is allowed to edit pages.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('edit_page', $page_id) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Mark this as content for a page.
</span><span class="cx" style="display: block; padding: 0 10px"> $content['post_type'] = 'page';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3053,7 +3053,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the user is allowed to add a category.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('manage_categories') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error(401, __('Sorry, you do not have the right to add a category.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error(401, __('Sorry, you are not allowed to add a category.'));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no slug was provided make it empty so that
</span><span class="cx" style="display: block; padding: 0 10px"> // WordPress will generate one.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3128,7 +3128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.deleteCategory' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('manage_categories') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete a category.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete a category.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status = wp_delete_term( $category_id, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3226,7 +3226,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 ( ! current_user_can( 'edit_comment', $comment_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
</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"> return $this->_prepare_comment( $comment );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3358,7 +3358,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 ( !current_user_can( 'edit_comment', $comment_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
</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"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3425,7 +3425,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 ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed to moderate or edit this comment.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
</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"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3629,7 +3629,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 ( ! current_user_can( 'publish_posts' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
</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"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3670,7 +3670,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 ( ! current_user_can( 'edit_post', $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details of this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details of this post.' ) );
</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"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3710,7 +3710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</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_posts' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3742,7 +3742,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</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_pages' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3774,7 +3774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</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_pages' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = get_page_templates();
</span><span class="cx" style="display: block; padding: 0 10px"> $templates['Default'] = 'default';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3868,7 +3868,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'manage_options' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to update options.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $option_names = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $options as $o_name => $o_value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3920,7 +3920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'upload_files' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You do not have permission to upload files.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed to upload files.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getMediaItem' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3968,7 +3968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'upload_files' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getMediaLibrary' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4012,7 +4012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</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_posts' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPostFormats' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4682,10 +4682,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->escape($actual_post);
</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_post', $post_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
</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"> $postdata = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4752,7 +4752,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 ( ! current_user_can( 'delete_post', $post_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to delete this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
</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"> $result = wp_delete_post( $post_ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4905,11 +4905,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case "post":
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'edit_others_posts' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to create posts as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case "page":
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'edit_others_pages' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to create pages as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to create pages as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Invalid post type' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5186,7 +5186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Invalid post ID.' ) );
</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_post', $post_ID ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to edit this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use wp.editPost to edit post types other than post and page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5245,12 +5245,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'post':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_others_posts' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to change the post author as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the post author as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'page':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_others_pages' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'You are not allowed to change the page author as this user.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to change the page author as this user.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5357,9 +5357,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' == $post_status || 'private' == $post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_type && ! current_user_can( 'publish_pages' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this page.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! current_user_can( 'publish_posts' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
</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">@@ -5790,7 +5790,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('upload_files') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->error = new IXR_Error( 401, __( 'You do not have permission to upload files.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</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="trunksrcwpincludesrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-includes/revision.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = (int) $_GET['preview_id'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __('You do not have permission to preview drafts.') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __('Sorry, you are not allowed to preview drafts.') );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('the_preview', '_set_preview');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/src/wp-includes/script-loader.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'noPerm' => __('You do not have permission to do that.'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'noPerm' => __('Sorry, you are not allowed to do that.'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'broken' => __('An unidentified error has occurred.')
</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">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancel' => __( 'Cancel' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'close' => __( 'Close' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cheatin' => __( 'Cheatin’ uh?' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'notAllowed' => __( 'You are not allowed to customize this site.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'notAllowed' => __( 'Sorry, you are not allowed to customize this site.' ),
</ins><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="cx" style="display: block; padding: 0 10px"> 'collapseSidebar' => __( 'Collapse Sidebar' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'noPerm' => __('You do not have permission to do that.'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'noPerm' => __('Sorry, you are not allowed to do that.'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'broken' => __('An unidentified error has occurred.')
</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="trunktestsphpunittestsadminincludesPostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( false, $_post_data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $_results );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'You are not allowed to create posts as this user.', $_results->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Sorry, you are not allowed to create posts as this user.', $_results->get_error_message() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edit Draft Post for another user
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_data = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_results = _wp_translate_postdata( true, $_post_data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $_results );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'edit_others_posts', $_results->get_error_code() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'You are not allowed to edit posts as this user.', $_results->get_error_message() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'Sorry, you are not allowed to edit posts as this user.', $_results->get_error_message() );
</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"> function test__wp_translate_postdata_cap_checks_editor() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpdeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/deleteTerm.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> $result = $this->myxmlrpcserver->wp_deleteTerm( array( 1, 'subscriber', 'subscriber', 'category', $this->term['term_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to delete terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to delete terms in this taxonomy.' ), $result->message );
</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"> function test_empty_term() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditCommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editComment.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editComment( array( 1, 'author', 'author', $comment_id, array( 'status' => 'hold' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 403, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to moderate or edit this comment.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to moderate or edit this comment.' ), $result->message );
</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"> function test_trash_comment() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,4 +69,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'trash', get_comment( $comment_id )->comment_approved );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpeditTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/editTerm.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_editTerm( array( 1, 'subscriber', 'subscriber', $this->parent_term['term_id'], array( 'taxonomy' => 'category' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to edit terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ), $result->message );
</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"> function test_term_not_exists() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTaxonomy.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> $result = $this->myxmlrpcserver->wp_getTaxonomy( array( 1, 'subscriber', 'subscriber', 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
</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"> function test_taxonomy_validated() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,4 +60,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( (array) $taxonomy->cap, $result['cap'], 'capabilities' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( (array) $taxonomy->object_type, $result['object_type'], 'object_types' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerm.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> $result = $this->myxmlrpcserver->wp_getTerm( array( 1, 'subscriber', 'subscriber', 'category', $this->term['term_id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
</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="trunktestsphpunittestsxmlrpcwpgetTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getTerms.php 2016-06-29 15:15:40 UTC (rev 37914)
</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"> $result = $this->myxmlrpcserver->wp_getTerms( array( 1, 'subscriber', 'subscriber', 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to assign terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ), $result->message );
</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"> function test_valid_terms() {
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpnewTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php 2016-06-29 14:06:01 UTC (rev 37913)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/newTerm.php 2016-06-29 15:15:40 UTC (rev 37914)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->myxmlrpcserver->wp_newTerm( array( 1, 'subscriber', 'subscriber', array( 'taxonomy' => 'category' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 401, $result->code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( __( 'You are not allowed to create terms in this taxonomy.' ), $result->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( __( 'Sorry, you are not allowed to create terms in this taxonomy.' ), $result->message );
</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"> function test_empty_term() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,4 +107,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'IXR_Error', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringMatchesFormat( '%d', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre>
</div>
</div>
</body>
</html>