<!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>[3739] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support: Use `wporg-forums` as the text domain for bbPress plugins.</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="http://meta.trac.wordpress.org/changeset/3739">3739</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/3739","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-07-29 10:44:47 +0000 (Fri, 29 Jul 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'>Support: Use `wporg-forums` as the text domain for bbPress plugins.
We already use it for the theme.
See <a href="http://meta.trac.wordpress.org/ticket/1544">#1544</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpversiondropdownincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-version-dropdown/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-07-29 10:35:45 UTC (rev 3738)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2016-07-29 10:44:47 UTC (rev 3739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,25 +78,25 @@
</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"> // Get required data.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = get_current_user_id();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = intval( $_GET['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id );
</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 ( ! $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_add_error( 'wporg_bbp_subscribe_term_id', __( '<strong>ERROR</strong>: No term was found! Which term are you subscribing/unsubscribing to?', 'wporg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_add_error( 'wporg_bbp_subscribe_term_id', __( '<strong>ERROR</strong>: No term was found! Which term are you subscribing/unsubscribing to?', '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_subscribe_logged_id', __( '<strong>ERROR</strong>: You must be logged in to do this!', 'wporg' ) );
</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 ( ! bbp_verify_nonce_request( 'toggle-term-subscription_' . $user_id . '_' . $term_id ) ) {
</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' ) );
</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 current user's ability to spectate.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! current_user_can( 'spectate' ) ) {
</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' ) );
</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">@@ -117,9 +117,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = get_term_link( $term_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_subscribed && '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_user', __( '<strong>ERROR</strong>: There was a problem subscribing to that term!', 'wporg' ) );
</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><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' ) );
</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">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> You are receiving this email because you subscribed to a topic tag.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Login and visit the topic to unsubscribe from these emails.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ),
</ins><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="cx" style="display: block; padding: 0 10px"> $topic_url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> You are receiving this email because you subscribed to a topic tag.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Login and visit the topic to unsubscribe from these emails.', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Login and visit the topic to unsubscribe from these emails.', 'wporg-forums' ),
</ins><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 class="cx" style="display: block; padding: 0 10px"> $reply_url
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $user_id int The user id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $term_id int The term id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool False if invalid, otherwise true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool False if invalid, otherwise true
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function add_user_subscription( $user_id = 0, $term_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) || empty( $term_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +383,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 ( ! self::is_user_subscribed_to_term( $user_id, $term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_term_meta( $term_id, self::META_KEY, $user_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_term_meta( $term_id, self::META_KEY, $user_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'wporg_bbp_get_term_subscribers_' . $term_id, 'bbpress_users' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wporg_bbp_add_user_term_subscription', $user_id, $term_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,8 +428,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bbp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => get_current_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'term_id' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subscribe' => esc_html__( 'Subscribe to this topic tag', 'wporg' ),
- 'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subscribe' => esc_html__( 'Subscribe to this topic tag', 'wporg-forums' ),
+ 'unsubscribe' => esc_html__( 'Unsubscribe from this topic tag', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'get_term_subscription_link' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 2016-07-29 10:35:45 UTC (rev 3738)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-topic-resolution/inc/class-plugin.php 2016-07-29 10:44:47 UTC (rev 3739)
</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"> * Add "Resolved" status to title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_topic_title( $title, $topic_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $resolved = __( 'Resolved', 'wporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $resolved = __( 'Resolved', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'yes' == $this->get_topic_resolution( array( 'id' => $topic_id ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( esc_html( '[%s]: %s' ), $resolved, $title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $resolution = $this->get_default_topic_resolution();
</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">- <p><label for="topic-resolved"><?php esc_html_e( 'This topic is', 'wporg' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><label for="topic-resolved"><?php esc_html_e( 'This topic is', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved">
</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"> return;
</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">- <p><label for="topic-resolved"><input type="checkbox" name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved" value="mu"> <?php esc_html_e( 'This topic is not a support question', 'wporg' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><label for="topic-resolved"><input type="checkbox" name="<?php echo esc_attr( self::META_KEY ); ?>" id="topic-resolved" value="mu"> <?php esc_html_e( 'This topic is not a support question', 'wporg-forums' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_forum_topic_resolution_column( $columns ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_merge( $columns, array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bbp_topic_resolution' => __( 'Support', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bbp_topic_resolution' => __( 'Support', '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">@@ -259,9 +259,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_topic_resolutions() {
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wporg_bbp_get_topic_resolutions', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'no' => __( 'not resolved', 'wporg' ),
- 'yes' => __( 'resolved', 'wporg' ),
- 'mu' => __( 'not a support question', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no' => __( 'not resolved', 'wporg-forums' ),
+ 'yes' => __( 'resolved', 'wporg-forums' ),
+ 'mu' => __( 'not a support question', '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_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 2016-07-29 10:35:45 UTC (rev 3738)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php 2016-07-29 10:44:47 UTC (rev 3739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,19 +169,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = intval( $_GET['post_id'] );
</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' ) );
</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' ) );
</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' ) );
</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' ) );
</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">@@ -204,9 +204,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' ) );
</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' ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,8 +255,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = bbp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => bbp_get_displayed_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_id' => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'flag' => esc_html__( 'Flag Author', 'wporg' ),
- 'unflag' => esc_html__( 'Unflag Author', 'wporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'flag' => esc_html__( 'Flag Author', 'wporg-forums' ),
+ 'unflag' => esc_html__( 'Unflag Author', 'wporg-forums' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ), 'get_user_flag_link' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['user_id'] ) ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpversiondropdownincclasspluginphp"></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-version-dropdown/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-version-dropdown/inc/class-plugin.php 2016-07-29 10:35:45 UTC (rev 3738)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-version-dropdown/inc/class-plugin.php 2016-07-29 10:44:47 UTC (rev 3739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,8 @@
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="wp-version"><?php esc_html_e( 'Version:', 'wporg' ); ?></label><br />
- <em><?php esc_html_e( 'Select the version of WordPress you are using.', 'wporg' ); ?></em><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="wp-version"><?php esc_html_e( 'Version:', 'wporg-forums' ); ?></label><br />
+ <em><?php esc_html_e( 'Select the version of WordPress you are using.', 'wporg-forums' ); ?></em><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="<?php echo esc_attr( self::META_KEY ); ?>" id="wp-version">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $versions as $key => $label ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="wp-other-version"><?php esc_html_e( 'Enter a different WordPress version here:', 'wporg' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="wp-other-version"><?php esc_html_e( 'Enter a different WordPress version here:', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="wp_other_version" id="wp-other-version" value="<?php echo esc_attr( $other_version ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> public function enqueue_scripts() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_single_forum() || bbp_is_single_topic() || bbp_is_topic_edit() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_script( 'wporg-bbp-version-dropdown', plugins_url( 'wporg-bbp-version-dropdown.js', dirname( __FILE__ ) ), array( 'jquery' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_script( 'wporg-bbp-version-dropdown', plugins_url( 'wporg-bbp-version-dropdown.js', __DIR__ ), array( 'jquery' ), '20160729', true );
</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">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $versions = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '0' => '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters( 'wporg_bbp_get_wp_versions', array() ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'other' => __( 'Other:', 'wporg' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'other' => __( 'Other:', 'wporg-forums' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> return $versions;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>