<!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>[12012] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support Forums: Improve consistency of various 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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/12012">12012</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12012","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-08-10 17:03:34 +0000 (Wed, 10 Aug 2022)</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'>Support Forums: Improve consistency of various error messages.
* Use sentence case for the word `Error`, instead of all caps. Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.
* Move the colon of the `Error:` prefix inside the `<strong>` tags.
This matches similar changes in WordPress core.
Follow-up to [WP47156], [WP53118], [WP53337], [WP53458], <a href="http://meta.trac.wordpress.org/changeset/3702">[3702]</a>, <a href="http://meta.trac.wordpress.org/changeset/3719">[3719]</a>, <a href="http://meta.trac.wordpress.org/changeset/3797">[3797]</a>, <a href="http://meta.trac.wordpress.org/changeset/3937">[3937]</a>, <a href="http://meta.trac.wordpress.org/changeset/4043">[4043]</a>, <a href="http://meta.trac.wordpress.org/changeset/11301">[11301]</a>, <a href="http://meta.trac.wordpress.org/changeset/11382">[11382]</a>, <a href="http://meta.trac.wordpress.org/changeset/11383">[11383]</a>, <a href="http://meta.trac.wordpress.org/changeset/11580">[11580]</a>.
Props NekoJonez.
Fixes <a href="http://meta.trac.wordpress.org/ticket/6309">#6309</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassstickiescompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassusersphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-users.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptopicresolutionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpusermoderationincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,15 +315,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for empty post id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_archive_post_id', __( '<strong>ERROR</strong>: No post was found! Which post are you archiving?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_archive_post_id', __( '<strong>Error:</strong> No post was found! Which post are you archiving?', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for current user.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $user_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_archive_logged_in', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_archive_logged_in', __( '<strong>Error:</strong> You must be logged in to do this!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! bbp_verify_nonce_request( 'toggle-post-archive_' . $user_id . '_' . $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_archive_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_archive_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
</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">@@ -350,9 +350,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $success ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_redirect( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === $is_archived && 'wporg_bbp_archive_post' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_archive_post', __( '<strong>ERROR</strong>: There was a problem archiving that post!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_archive_post', __( '<strong>Error:</strong> There was a problem archiving that post!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $is_archived && 'wporg_bbp_unarchive_post' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_unarchive_post', __( '<strong>ERROR</strong>: There was a problem unarchiving that post!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_unarchive_post', __( '<strong>Error:</strong> There was a problem unarchiving that post!', 'wporg-forums' ) );
</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">@@ -711,13 +711,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure topic exists
</span><span class="cx" style="display: block; padding: 0 10px"> $topic = bbp_get_topic( $topic_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $topic ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>ERROR:</strong> This topic could not be found or no longer exists.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_toggle_topic_missing', __( '<strong>Error:</strong> This topic could not be found or no longer exists.', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> // What is the user doing here?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_topic', $topic_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_toggle_topic_permission', __( '<strong>Error:</strong> You do not have permission to do that.', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -775,13 +775,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure reply exists
</span><span class="cx" style="display: block; padding: 0 10px"> $reply = bbp_get_reply( $reply_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $reply ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>ERROR:</strong> This reply could not be found or no longer exists.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_toggle_reply_missing', __( '<strong>Error:</strong> This reply could not be found or no longer exists.', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> // What is the user doing here?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_reply', $reply_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>ERROR:</strong> You do not have permission to do that.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_toggle_reply_permission', __( '<strong>Error:</strong> You do not have permission to do that.', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -839,7 +839,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_topic_open( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_close_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem closing the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem closing the topic.', 'wporg-forums' );
</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"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,7 +849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_topic_open( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_open_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem opening the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem opening the topic.', 'wporg-forums' );
</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"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,7 +859,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_topic_sticky( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_stick_topic( $r['id'], ! empty( $_GET['super'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem sticking the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem sticking the topic.', 'wporg-forums' );
</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"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +869,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_topic_sticky( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_unstick_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unsticking the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem unsticking the topic.', 'wporg-forums' );
</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"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,7 +879,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_topic_spam( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_spam_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem marking the topic as spam.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,7 +890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_topic_spam( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_unspam_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem unmarking the topic as spam.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,7 +901,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_topic_pending( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_unapprove_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unapproving the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem unapproving the topic.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,7 +912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_topic_pending( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_approve_topic( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem approving the topic.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem approving the topic.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -952,7 +952,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_reply_spam( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_spam_reply( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem marking the reply as spam.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem marking the reply as spam.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -963,7 +963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_reply_spam( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_unspam_reply( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem unmarking the reply as spam.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,7 +974,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bbp_is_reply_pending( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_unapprove_reply( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem unapproving the reply.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem unapproving the reply.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,7 +985,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_reply_pending( $r['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['status'] = bbp_approve_reply( $r['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval['message'] = __( '<strong>ERROR</strong>: There was a problem approving the reply.', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval['message'] = __( '<strong>Error:</strong> There was a problem approving the reply.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $retval['view_all'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_links_please',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Link to forum user guide explaining this. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<strong>Error</strong>: Please <a href="%s">do not add links to your review</a>, keep the review about your experience in text only.', 'wporg-forums' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<strong>Error:</strong> Please <a href="%s">do not add links to your review</a>, keep the review about your experience in text only.', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://wordpress.org/support/forum-user-guide/faq/#why-are-links-not-allowed-in-reviews'
</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">@@ -392,12 +392,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // bbPress doesn't have a wrapper to check for specific errors, so we'll reach into bbPress.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbpress()->errors->get_error_message( 'bbp_topic_title' ) && empty( $_POST['bbp_topic_title'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbpress()->errors->remove( 'bbp_topic_title' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_topic_title', __( '<strong>Error</strong>: Your review needs a title.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_topic_title', __( '<strong>Error:</strong> Your review needs a title.', 'wporg-forums' ) );
</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 ( bbpress()->errors->get_error_message( 'bbp_topic_content' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbpress()->errors->remove( 'bbp_topic_content' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_topic_content', __( '<strong>Error</strong>: Your review cannot be empty.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_topic_content', __( '<strong>Error:</strong> Your review cannot be empty.', 'wporg-forums' ) );
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassstickiescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,15 +119,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for empty topic or term id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $topic || ! $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_sticky_topic_id', __( '<strong>ERROR</strong>: No topic was found! Which topic are you sticking?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_sticky_topic_id', __( '<strong>Error:</strong> No topic was found! Which topic are you sticking?', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check user.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $this->user_can_stick( $user_id, $term->term_id, $topic->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_sticky_logged_in', __( '<strong>ERROR</strong>: You do not have permission to do this!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_sticky_logged_in', __( '<strong>Error:</strong> You do not have permission to do this!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif( ! bbp_verify_nonce_request( 'toggle-topic-sticky_' . $topic->ID . '_' . $term->term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_sticky_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_sticky_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
</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 ( bbp_has_errors() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,9 +149,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $success && ! is_wp_error( $success ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_redirect( $permalink );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === $is_sticky && 'wporg_bbp_stick_compat_topic' == $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_stick_compat_topic', __( '<strong>ERROR</strong>: There was a problem sticking that topic!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_stick_compat_topic', __( '<strong>Error:</strong> There was a problem sticking that topic!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $is_sticky && 'wporg_bbp_unstick_compat_topic' == $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_unstick_compat_topic', __( '<strong>ERROR</strong>: There was a problem unsticking that topic!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_unstick_compat_topic', __( '<strong>Error:</strong> There was a problem unsticking that topic!', 'wporg-forums' ) );
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-users.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-users.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> is_email( $_POST['email'] ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> is_email_address_unsafe( $_POST['email'] )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'bbp_user_email_invalid', __( '<strong>Error</strong>: That email address cannot be used.', 'wporg-forums' ), array( 'form-field' => 'email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'bbp_user_email_invalid', __( '<strong>Error:</strong> That email address cannot be used.', 'wporg-forums' ), array( 'form-field' => 'email' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Override the post variable to ensure that bbPress & core doesn't use it.
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = $_REQUEST['email'] = $user_email;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_subscribed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You are subscribed to this forum, and will receive emails for future topic activity. <a href="%1$s">Unsubscribe from %2$s.</a>', 'wporg-forums' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You are subscribed to this forum, and will receive emails for future topic activity. <a href="%1$s">Unsubscribe from %2$s</a>.', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> self::get_subscription_url( get_current_user_id(), $term->term_id, $this->taxonomy ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $term->name )
</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"> $user_id = $this->has_valid_unsubscription_token();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>ERROR</strong>: Link expired!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_invalid_token', __( '<strong>Error:</strong> Link expired!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -205,15 +205,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for empty term id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_logged_id', __( '<strong>Error:</strong> You must be logged in to do this!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'token' !== $auth && ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $this->taxonomy ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check user's ability to spectate if attempting to subscribe to a term.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! user_can( $user_id, 'spectate' ) && 'wporg_bbp_subscribe_term' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to do this!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_permissions', __( '<strong>Error:</strong> You don\'t have permission to do this!', 'wporg-forums' ) );
</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 ( bbp_has_errors() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,10 +245,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_redirect( $redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Term: topic tag */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>ERROR</strong>: There was a problem subscribing to that term!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_user', __( '<strong>Error:</strong> There was a problem subscribing to that term!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $is_subscribed && 'wporg_bbp_unsubscribe_term' === $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Term: topic tag */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>ERROR</strong>: There was a problem unsubscribing from that term!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_unsubscribe_user', __( '<strong>Error:</strong> There was a problem unsubscribing from that term!', 'wporg-forums' ) );
</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">@@ -360,7 +360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> %4$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-To unsubscribe from future emails click here:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+To unsubscribe from future emails, click here:
</ins><span class="cx" style="display: block; padding: 0 10px"> ####UNSUB_LINK####', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_author_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $topic_content,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> %4$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-To unsubscribe from future emails click here:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+To unsubscribe from future emails, click here:
</ins><span class="cx" style="display: block; padding: 0 10px"> ####UNSUB_LINK####', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_author_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $reply_content,
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptopicresolutionincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,19 +286,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for empty topic id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $topic_id ) || ! $topic ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_topic_resolution_topic_id', __( '<strong>ERROR</strong>: No topic was found!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_topic_resolution_topic_id', __( '<strong>Error:</strong> No topic was found!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check valid resolution.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $this->is_valid_topic_resolution( $resolution ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_topic_resolution_invalid', __( '<strong>ERROR</strong>: That is not a valid topic resolution!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_topic_resolution_invalid', __( '<strong>Error:</strong> That is not a valid topic resolution!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check user permissions.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $this->user_can_resolve( $user_id, $topic->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_topic_resolution_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to do this!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_topic_resolution_permissions', __( '<strong>Error:</strong> You don\'t have permission to do this!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! bbp_verify_nonce_request( 'toggle-topic-resolution_' . $topic->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_topic_resolution_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_topic_resolution_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
</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 ( bbp_has_errors() ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpusermoderationincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php 2022-08-10 16:20:53 UTC (rev 12011)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php 2022-08-10 17:03:34 UTC (rev 12012)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,19 +182,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset( $_GET['post_id'] ) ? intval( $_GET['post_id'] ) : 0;
</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"> if ( ! $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_post_id', __( '<strong>ERROR</strong>: No post was found! Which topic or reply are you marking for moderation?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_post_id', __( '<strong>Error:</strong> No post was found! Which topic or reply are you marking for moderation?', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that user id matches post author
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $post->post_author != intval( $_GET['user_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>ERROR</strong>: That author does not match the flagged post.', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_post_user', __( '<strong>Error:</strong> That author does not match the flagged post.', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check nonce
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! bbp_verify_nonce_request( 'toggle-flag_' . $post->post_author . '_' . $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>ERROR</strong>: Are you sure you wanted to do that?', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_nonce', __( '<strong>Error:</strong> Are you sure you wanted to do that?', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check current user's ability to moderate
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! current_user_can( 'moderate' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>ERROR</strong>: You don\'t have permission to moderate that user!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_permissions', __( '<strong>Error:</strong> You don\'t have permission to moderate that user!', 'wporg-forums' ) );
</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"> // Bail if errors
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,9 +217,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = bbp_get_topic_permalink( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_redirect( $redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === $is_flagged && 'bbp_flag_user' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>ERROR</strong>: There was a problem flagging that user!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_user', __( '<strong>Error:</strong> There was a problem flagging that user!', 'wporg-forums' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $is_flagged && 'bbp_unflag_user' == $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>ERROR</strong>: There was a problem unflagging that user!', 'wporg-forums' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_flag_unuser', __( '<strong>Error:</strong> There was a problem unflagging that user!', 'wporg-forums' ) );
</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>
</div>
</body>
</html>