<!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>[7813] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress: Support Forum: Updated bbPress templates</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/7813">7813</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/7813","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>netweb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-01 07:02:31 +0000 (Thu, 01 Nov 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Support Forum: Updated bbPress templates
See <a href="http://meta.trac.wordpress.org/ticket/3485">#3485</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentarchiveforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-archive-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentarchivetopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-archive-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsinglereplyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-reply.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingletopicleadphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-topic-lead.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingletopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleuserphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-user.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleviewphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-view.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacknosearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-no-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacknotopicsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-no-topics.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacksearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformreplyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-reply.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicmergephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic-merge.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicsplitphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic-split.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopforumshomepagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopforumsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresslooppostsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-posts.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresslooprepliesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-replies.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopreplytopicsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-reply-topics.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingleforumhomepagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingleforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsinglereplytopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-reply-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsinglereplyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-reply.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingletopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserdetailsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserprofilephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserreviewswrittenphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-reviews-written.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressusertopicsrepliedtophp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-topics-replied-to.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentarchiveforumphp"></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/themes/pub/wporg-support/bbpress/content-archive-forum.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/themes/pub/wporg-support/bbpress/content-archive-forum.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-archive-forum.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,16 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! is_front_page() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Archive Forum Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+if ( ! is_front_page() && ! is_archive( 'forum' ) ) : ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_breadcrumb(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +20,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_template_before_forums_index' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_has_forums() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <?php if ( is_front_page() ) : ?>
- <?php bbp_get_template_part( 'loop', 'forums-homepage' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( is_front_page() || is_archive( 'forum' ) ) : ?>
+ <?php bbp_get_template_part( 'loop', 'forums-homepage' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'forums' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'forums' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentarchivetopicphp"></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/themes/pub/wporg-support/bbpress/content-archive-topic.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/themes/pub/wporg-support/bbpress/content-archive-topic.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-archive-topic.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Archive Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php bbp_breadcrumb(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+bbp_breadcrumb(); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_forum_archive() || bbp_is_topic_archive() || bbp_is_search() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-search-form">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,15 +36,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_has_topics() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsearchphp"></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/themes/pub/wporg-support/bbpress/content-search.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/themes/pub/wporg-support/bbpress/content-search.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-search.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php bbp_breadcrumb(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+bbp_breadcrumb(); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_forum_archive() || bbp_is_topic_archive() || bbp_is_search() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-search-form">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,19 +29,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_has_search_results() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'search' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'search' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'search' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( bbp_get_search_terms() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'no-search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'no-search' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'search' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'search' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleforumphp"></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/themes/pub/wporg-support/bbpress/content-single-forum.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/themes/pub/wporg-support/bbpress/content-single-forum.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-forum.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single Topic Content Part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_breadcrumb(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php printf( __( '%s Forum', 'wporg-forums' ), bbp_get_topic_title() ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php printf( esc_html__( '%s Forum', 'wporg-forums' ), bbp_get_topic_title() ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php bbp_forum_content(); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,21 +29,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! bbp_is_forum_category() && bbp_has_topics() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! bb_base_topic_search_query( false ) ) bbp_get_template_part( 'form', 'topic' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! bb_base_topic_search_query( false ) ) {
+ bbp_get_template_part( 'form', 'topic' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php elseif( !bbp_is_forum_category() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( ! bbp_is_forum_category() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! bb_base_topic_search_query( false ) ) bbp_get_template_part( 'form', 'topic' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( ! bb_base_topic_search_query( false ) ) {
+ bbp_get_template_part( 'form', 'topic' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsinglereplyphp"></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/themes/pub/wporg-support/bbpress/content-single-reply.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/themes/pub/wporg-support/bbpress/content-single-reply.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-reply.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,38 +1,35 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Single Reply Content Part
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php bbp_breadcrumb(); ?>
-
-<div id="bbpress-forums">
-
- <?php do_action( 'bbp_template_before_single_reply' ); ?>
-
- <?php if ( post_password_required() ) : ?>
-
- <?php bbp_get_template_part( 'form', 'protected' ); ?>
-
- <?php else : ?>
-
- <ul id="topic-<?php bbp_topic_id(); ?>-replies" class="forums bbp-replies">
-
- <li class="bbp-body">
-
- <?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
-
- </li><!-- .bbp-body -->
-
- </ul><!-- #topic-<?php bbp_topic_id(); ?>-replies -->
-
- <?php endif; ?>
-
- <?php do_action( 'bbp_template_after_single_reply' ); ?>
-
-</div>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Single Reply Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+bbp_breadcrumb(); ?>
+
+<div id="bbpress-forums">
+
+ <?php do_action( 'bbp_template_before_single_reply' ); ?>
+
+ <?php if ( post_password_required() ) : ?>
+
+ <?php bbp_get_template_part( 'form', 'protected' ); ?>
+
+ <?php else : ?>
+
+ <ul id="topic-<?php bbp_topic_id(); ?>-replies" class="forums bbp-replies">
+
+ <li class="bbp-body">
+
+ <?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
+
+ </li><!-- .bbp-body -->
+
+ </ul><!-- #topic-<?php bbp_topic_id(); ?>-replies -->
+
+ <?php endif; ?>
+
+ <?php do_action( 'bbp_template_after_single_reply' ); ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingletopicleadphp"></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/themes/pub/wporg-support/bbpress/content-single-topic-lead.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/themes/pub/wporg-support/bbpress/content-single-topic-lead.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-topic-lead.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single Topic Part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,9 +43,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_author_details' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_topic_author_link( array( 'sep' => '', 'show_role' => false, 'size' => 100 ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_topic_author_link(
+ array(
+ 'sep' => '',
+ 'show_role' => false,
+ 'size' => 100,
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_user_nicename( bbp_get_topic_author_id(), array( 'before' => '<p class="bbp-user-nicename">(@', 'after' => ')</p><br />' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_user_nicename(
+ bbp_get_topic_author_id(),
+ array(
+ 'before' => '<p class="bbp-user-nicename">(@',
+ 'after' => ')</p><br />',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'moderate', bbp_get_topic_id() ) && 'bbp_blocked' === bbp_get_user_role( bbp_get_topic_author_id() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wporg-bbp-user-is-blocked">[<?php esc_attr_e( 'This user is blocked', 'wporg-forums' ); ?>]</p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingletopicphp"></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/themes/pub/wporg-support/bbpress/content-single-topic.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/themes/pub/wporg-support/bbpress/content-single-topic.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-topic.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single Topic Content Part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,13 +34,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'replies' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'replies' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php elseif( bb_base_reply_search_query() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( bb_base_reply_search_query() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'no-replies' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'no-replies' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleuserphp"></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/themes/pub/wporg-support/bbpress/content-single-user.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/themes/pub/wporg-support/bbpress/content-single-user.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-user.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single User Content Part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,21 +23,59 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'user', 'details' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="bbp-user-body">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bbp_is_favorites() ) bbp_get_template_part( 'user', 'favorites' ); ?>
- <?php if ( bbp_is_subscriptions() ) bbp_get_template_part( 'user', 'subscriptions' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( bbp_is_favorites() ) {
+ bbp_get_template_part( 'user', 'favorites' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( function_exists( 'bbp_is_single_user_engagements' ) && bbp_is_single_user_engagements() ) {
- bbp_get_template_part( 'user', 'engagements' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bbp_is_subscriptions() ) {
+ bbp_get_template_part( 'user', 'subscriptions' );
+ }
</ins><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">- <?php if ( bbp_is_single_user_topics() ) bbp_get_template_part( 'user', 'topics-created' ); ?>
- <?php if ( bbp_is_single_user_replies() ) bbp_get_template_part( 'user', 'replies-created' ); ?>
- <?php if ( wporg_support_is_single_user_reviews() ) bbp_get_template_part( 'user', 'reviews-written' ); ?>
- <?php if ( wporg_support_is_single_user_topics_replied_to() ) bbp_get_template_part( 'user', 'topics-replied-to' ); ?>
- <?php if ( bbp_is_single_user_edit() ) bbp_get_template_part( 'form', 'user-edit' ); ?>
- <?php if ( bbp_is_single_user_profile() ) bbp_get_template_part( 'user', 'profile' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( function_exists( 'bbp_is_single_user_engagements' ) && bbp_is_single_user_engagements() ) {
+ bbp_get_template_part( 'user', 'engagements' );
+ }
+ ?>
+
+ <?php
+ if ( bbp_is_single_user_topics() ) {
+ bbp_get_template_part( 'user', 'topics-created' );
+ }
+ ?>
+
+ <?php
+ if ( bbp_is_single_user_replies() ) {
+ bbp_get_template_part( 'user', 'replies-created' );
+ }
+ ?>
+
+ <?php
+ if ( wporg_support_is_single_user_reviews() ) {
+ bbp_get_template_part( 'user', 'reviews-written' );
+ }
+ ?>
+
+ <?php
+ if ( wporg_support_is_single_user_topics_replied_to() ) {
+ bbp_get_template_part( 'user', 'topics-replied-to' );
+ }
+ ?>
+
+ <?php
+ if ( bbp_is_single_user_edit() ) {
+ bbp_get_template_part( 'form', 'user-edit' );
+ }
+ ?>
+
+ <?php
+ if ( bbp_is_single_user_profile() ) {
+ bbp_get_template_part( 'user', 'profile' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleviewphp"></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/themes/pub/wporg-support/bbpress/content-single-view.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/themes/pub/wporg-support/bbpress/content-single-view.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-view.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Single View Content Part
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,21 +20,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( bbp_get_view_id(), array( 'spam', 'pending', 'archived' ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( bbp_get_view_id(), array( 'spam', 'pending', 'archived' ), true ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'posts' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'posts' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'feedback', 'no-topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacknosearchphp"></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/themes/pub/wporg-support/bbpress/feedback-no-search.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/themes/pub/wporg-support/bbpress/feedback-no-search.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-no-search.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="bbp-template-notice">
- <p><?php _e( 'No results found. Try a different search or start a new post.', 'wporg-forums' ); ?></p>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * No Search Results Feedback Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
+<div class="bbp-template-notice">
+ <p><?php esc_html_e( 'No results found. Try a different search or start a new post.', 'wporg-forums' ); ?></p>
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacknotopicsphp"></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/themes/pub/wporg-support/bbpress/feedback-no-topics.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/themes/pub/wporg-support/bbpress/feedback-no-topics.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-no-topics.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="bbp-template-notice">
- <p><?php _e( 'No topics found. Select another view or start a new post.', 'wporg-forums' ); ?></p>
-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * No Topics Feedback Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
+<div class="bbp-template-notice">
+ <p><?php esc_html_e( 'No topics found. Select another view or start a new post.', 'wporg-forums' ); ?></p>
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressfeedbacksearchphp"></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/themes/pub/wporg-support/bbpress/feedback-search.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/themes/pub/wporg-support/bbpress/feedback-search.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/feedback-search.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search Results Feedback Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Please enter some search terms above', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Please enter some search terms above', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformreplyphp"></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/themes/pub/wporg-support/bbpress/form-reply.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/themes/pub/wporg-support/bbpress/form-reply.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-reply.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * New/Edit Reply
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,13 +41,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: forum title */
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html__( 'The forum ‘%s’ is closed to new topics and replies, however your posting capabilities still allow you to post.', 'wporg-forums' ),
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_get_forum_title( bbp_get_topic_forum_id() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! ( bbp_use_wp_editor() || current_user_can( 'unfiltered_html' ) ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="form-allowed-tags">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><?php esc_html_e( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:','wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <code><?php bbp_allowed_tags(); ?></code>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php esc_html_e( 'You cannot reply to this review.', 'wporg-forums' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php printf( __( 'You must be <a href="%s">logged in</a> to reply to this review.', 'wporg-forums' ), wp_login_url() ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php printf( esc_html__( 'You must be <a href="%s">logged in</a> to reply to this review.', 'wporg-forums' ), wp_login_url() ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php esc_html_e( 'You cannot reply to this topic.', 'wporg-forums' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php printf( __( 'You must be <a href="%s">logged in</a> to reply to this topic.', 'wporg-forums' ), wp_login_url() ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><?php printf( esc_html__( 'You must be <a href="%s">logged in</a> to reply to this topic.', 'wporg-forums' ), wp_login_url() ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,4 +249,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+endif;
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicmergephp"></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/themes/pub/wporg-support/bbpress/form-topic-merge.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/themes/pub/wporg-support/bbpress/form-topic-merge.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic-merge.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Merge Topic
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,47 +16,57 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="merge-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-merge">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <form id="merge_topic" name="merge_topic" method="post" action="<?php the_permalink(); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <form id="merge_topic" name="merge_topic" method="post" action="<?php bbp_topic_permalink(); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php printf( __( 'Merge topic "%s"', 'wporg-forums' ), bbp_get_topic_title() ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php printf( esc_html__( 'Merge topic "%s"', 'wporg-forums' ), bbp_get_topic_title() ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice info">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'wporg-forums' ); ?></p>
- <p><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'wporg-forums' ); ?></p>
+ <p><?php esc_html_e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'All replies within both the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a second earlier than this one.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'All replies within both the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a second earlier than this one.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php _e( 'Destination', 'wporg-forums' ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php esc_html_e( 'Destination', 'wporg-forums' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( bbp_has_topics(
+ array(
+ 'show_stickies' => false,
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post__not_in' => array( bbp_get_topic_id() ),
+ )
+ ) ) :
+ ?>
</ins><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="bbp_destination_topic"><?php _e( 'Merge with this topic:', 'wporg-forums' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_destination_topic"><?php esc_html_e( 'Merge with this topic:', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_dropdown( array(
- 'post_type' => bbp_get_topic_post_type(),
- 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
- 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
- 'selected' => -1,
- 'numberposts' => 100,
- 'orderby' => 'date',
- 'order' => 'DESC',
- 'exclude' => bbp_get_topic_id(),
- 'select_id' => 'bbp_destination_topic'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_dropdown(
+ array(
+ 'post_type' => bbp_get_topic_post_type(),
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+ 'selected' => -1,
+ 'numberposts' => 100,
+ 'orderby' => 'date',
+ 'order' => 'DESC',
+ 'exclude' => bbp_get_topic_id(),
+ 'select_id' => 'bbp_destination_topic',
+ )
+ );
</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"> <?php else : ?>
</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><?php _e( 'There are no other topics in this forum to merge with.', 'wporg-forums' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'There are no other topics in this forum to merge with.', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php _e( 'Topic Extras', 'wporg-forums' ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php esc_html_e( 'Topic Extras', 'wporg-forums' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,17 +81,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_subscriptions_active() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_subscribers"><?php esc_html_e( 'Merge topic subscribers', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_favoriters"><?php esc_html_e( 'Merge topic favoriters', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_allow_topic_tags() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_tags"><?php esc_html_e( 'Merge topic tags', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,11 +99,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( '<strong>WARNING:</strong> This process cannot be undone.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-submit-wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button button-primary submit"><?php _e( 'Submit', 'wporg-forums' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button button-primary submit"><?php esc_html_e( 'Submit', 'wporg-forums' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'wporg-forums' ) : _e( 'You cannot edit this topic.', 'wporg-forums' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="entry-content"><?php is_user_logged_in() ? esc_html_e( 'You do not have the permissions to edit this topic!', 'wporg-forums' ) : esc_html_e( 'You cannot edit this topic.', 'wporg-forums' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicsplitphp"></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/themes/pub/wporg-support/bbpress/form-topic-split.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/themes/pub/wporg-support/bbpress/form-topic-split.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic-split.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Split Topic
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,44 +20,54 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php printf( __( 'Split topic "%s"', 'wporg-forums' ), bbp_get_topic_title() ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php printf( esc_html__( 'Split topic "%s"', 'wporg-forums' ), bbp_get_topic_title() ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice info">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php _e( 'Split Method', 'wporg-forums' ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php esc_html_e( 'Split Method', 'wporg-forums' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_split_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'wporg-forums' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_split_option_reply"><?php printf( esc_html__( 'New topic in <strong>%s</strong> titled:', 'wporg-forums' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="bbp_topic_split_destination_title" value="<?php echo esc_attr( sprintf( __( 'Split: %s', 'wporg-forums' ), bbp_get_topic_title() ) ); ?>" size="35" name="bbp_topic_split_destination_title" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if ( bbp_has_topics(
+ array(
+ 'show_stickies' => false,
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post__not_in' => array( bbp_get_topic_id() ),
+ )
+ ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'wporg-forums' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_split_option_existing"><?php esc_html_e( 'Use an existing topic in this forum:', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bbp_dropdown( array(
- 'post_type' => bbp_get_topic_post_type(),
- 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
- 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
- 'selected' => -1,
- 'numberposts' => 100,
- 'orderby' => 'date',
- 'exclude' => bbp_get_topic_id(),
- 'select_id' => 'bbp_destination_topic'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_dropdown(
+ array(
+ 'post_type' => bbp_get_topic_post_type(),
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+ 'selected' => -1,
+ 'numberposts' => 100,
+ 'orderby' => 'date',
+ 'exclude' => bbp_get_topic_id(),
+ 'select_id' => 'bbp_destination_topic',
+ )
+ );
</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"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <legend><?php _e( 'Topic Extras', 'wporg-forums' ); ?></legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <legend><?php esc_html_e( 'Topic Extras', 'wporg-forums' ); ?></legend>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,17 +84,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_subscriptions_active() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_subscribers"><?php esc_html_e( 'Copy subscribers to the new topic', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_favoriters"><?php esc_html_e( 'Copy favoriters to the new topic', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_allow_topic_tags() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_tags"><?php esc_html_e( 'Copy topic tags to the new topic', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,11 +102,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( '<strong>WARNING:</strong> This process cannot be undone.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-submit-wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button button-primary submit"><?php _e( 'Submit', 'wporg-forums' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="submit" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button button-primary submit"><?php esc_html_e( 'Submit', 'wporg-forums' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'wporg-forums' ) : _e( 'You cannot edit this topic.', 'wporg-forums' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="entry-content"><?php is_user_logged_in() ? esc_html_e( 'You do not have the permissions to edit this topic!', 'wporg-forums' ) : esc_html_e( 'You cannot edit this topic.', 'wporg-forums' ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformtopicphp"></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/themes/pub/wporg-support/bbpress/form-topic.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/themes/pub/wporg-support/bbpress/form-topic.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-topic.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,16 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! bbp_is_single_forum() && ! bbp_is_single_view() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * New/Edit Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+if ( ! bbp_is_single_forum() && ! bbp_is_single_view() ) : ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="bbpress-forums">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_breadcrumb(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,17 +29,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bbp_is_topic_edit() ) {
- printf( __( 'Now Editing “%s”', 'wporg-forums' ), bbp_get_topic_title() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bbp_is_topic_edit() ) {
+ printf( esc_html__( 'Now Editing “%s”', 'wporg-forums' ), bbp_get_topic_title() );
+ } else {
+ if ( bbp_is_single_forum() ) {
+ printf( esc_html__( 'Create a new topic in “%s Forum”', 'wporg-forums' ), bbp_get_forum_title() );
+ } elseif ( bbp_is_single_view() && 'reviews' === bbp_get_view_id() ) {
+ esc_html_e( 'Create a new review', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bbp_is_single_forum() ) {
- printf( __( 'Create a new topic in “%s Forum”', 'wporg-forums' ), bbp_get_forum_title() );
- } elseif ( bbp_is_single_view() && 'reviews' === bbp_get_view_id() ) {
- _e( 'Create a new review', 'wporg-forums' );
- } else {
- _e( 'Create a new topic', 'wporg-forums' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html_e( 'Create a new topic', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> </legend>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,29 +56,36 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</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><?php _e( 'When posting a new topic, follow these steps:', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'When posting a new topic, follow these steps:', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Handbook URL for forum welcome */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<strong>Read the <a href="%s">Forum Welcome</a></strong> to find out how to maximize your odds of getting help!', 'wporg-forums' ), esc_url( __( 'https://wordpress.org/support/welcome/', 'wporg-forums' ) ) );
- ?></li>
- <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( esc_html__( '<strong>Read the <a href="%s">Forum Welcome</a></strong> to find out how to maximize your odds of getting help!', 'wporg-forums' ), esc_url( esc_html__( 'https://wordpress.org/support/welcome/', 'wporg-forums' ) ) );
+ ?>
+ </li>
+ <li>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to search */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<strong><a href="%s">Search</a> the forums</strong> to see if your topic has been resolved already.', 'wporg-forums' ), esc_url( bbp_get_search_url() ) );
- ?></li>
- <li><?php _e( '<strong>Update to the latest versions</strong> of your plugins, themes, and WordPress.', 'wporg-forums' ); ?></li>
- <li><?php _e( '<strong>Note the exact steps</strong> needed to reproduce your issue.', 'wporg-forums' ); ?></li>
- <li><?php _e( '<strong>Provide any information</strong> you might think is useful. If your issue is visual, note your browser and operating system. If your issue is technical, note your server environment.', 'wporg-forums' ); ?></li>
- <?php if ( ! bbp_is_single_view() || ! in_array( bbp_get_view_id(), array( 'theme', 'plugin' ) ) ) : ?>
- <li><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( esc_html__( '<strong><a href="%s">Search</a> the forums</strong> to see if your topic has been resolved already.', 'wporg-forums' ), esc_url( bbp_get_search_url() ) );
+ ?>
+ </li>
+ <li><?php esc_html_e( '<strong>Update to the latest versions</strong> of your plugins, themes, and WordPress.', 'wporg-forums' ); ?></li>
+ <li><?php esc_html_e( '<strong>Note the exact steps</strong> needed to reproduce your issue.', 'wporg-forums' ); ?></li>
+ <li><?php esc_html_e( '<strong>Provide any information</strong> you might think is useful. If your issue is visual, note your browser and operating system. If your issue is technical, note your server environment.', 'wporg-forums' ); ?></li>
+ <?php if ( ! bbp_is_single_view() || ! in_array( bbp_get_view_id(), array( 'theme', 'plugin' ), true ) ) : ?>
+ <li>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Theme Directory URL, 2: Appearance icon, 3: Plugin Directory URL, 4: Plugins icon */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( '<strong>Looking for help with a specific <a href="%1$s">%2$s theme</a> or <a href="%3$s">%4$s plugin</a>?</strong> Don\'t post here – instead, head to the theme or plugin\'s page and find the "View support forum" link to visit the theme or plugin\'s individual forum.', 'wporg-forums' ),
- esc_url( __( 'https://wordpress.org/themes/', 'wporg-forums' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ esc_html__( '<strong>Looking for help with a specific <a href="%1$s">%2$s theme</a> or <a href="%3$s">%4$s plugin</a>?</strong> Don\'t post here – instead, head to the theme or plugin\'s page and find the "View support forum" link to visit the theme or plugin\'s individual forum.', 'wporg-forums' ),
+ esc_url( esc_html__( 'https://wordpress.org/themes/', 'wporg-forums' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<span class="dashicons dashicons-admin-appearance"></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( __( 'https://wordpress.org/plugins/', 'wporg-forums' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( esc_html__( 'https://wordpress.org/plugins/', 'wporg-forums' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<span class="dashicons dashicons-admin-plugins"></span>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,10 +95,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( !bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to create a topic.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to create a topic.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'unfiltered_html' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Your account has the ability to post unrestricted HTML content.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,13 +120,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_form_title' ); ?>
</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="bbp_topic_title"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_title">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_single_view() && 'reviews' === bbp_get_view_id() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Review Title (Maximum Length: %d):', 'wporg-forums' ), bbp_get_title_max_length() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( esc_html__( 'Review Title (Maximum Length: %d):', 'wporg-forums' ), bbp_get_title_max_length() );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Topic Title (Maximum Length: %d):', 'wporg-forums' ), bbp_get_title_max_length() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( esc_html__( 'Topic Title (Maximum Length: %d):', 'wporg-forums' ), bbp_get_title_max_length() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" size="40" name="bbp_topic_title" maxlength="<?php bbp_title_max_length(); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,13 +143,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_form_tags' ); ?>
</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="bbp_topic_tags"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_tags">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( bbp_is_single_view() && 'reviews' === bbp_get_view_id() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'Review Tags:', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html_e( 'Review Tags:', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _e( 'Topic Tags:', 'wporg-forums' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html_e( 'Topic Tags:', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" value="<?php bbp_form_topic_tags(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" aria-describedby="bbp_topic_tags_description" <?php disabled( bbp_is_topic_spam() ); ?> /><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <em id="bbp_topic_tags_description"><?php esc_html_e( 'Separate tags with commas', 'wporg-forums' ); ?></em>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_form_forum' ); ?>
</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="bbp_forum_id"><?php _e( 'Forum:', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_forum_id"><?php esc_html_e( 'Forum:', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_dropdown( array( 'selected' => bbp_get_form_topic_forum() ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_topic_edit() || ( bbp_is_topic_edit() && !bbp_is_topic_anonymous() ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bbp_is_subscriptions_active() && ! bbp_is_anonymous() && ( ! bbp_is_topic_edit() || ( bbp_is_topic_edit() && ! bbp_is_topic_anonymous() ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_form_subscriptions' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,13 +178,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe" <?php bbp_form_topic_subscribed(); ?> />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bbp_is_topic_edit() && ( get_the_author_meta( 'ID' ) != bbp_get_current_user_id() ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bbp_is_topic_edit() && ( get_the_author_meta( 'ID' ) !== bbp_get_current_user_id() ) ) : ?>
</ins><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="bbp_topic_subscription"><?php _e( 'Notify the author of follow-up replies via email', 'wporg-forums' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_subscription"><?php esc_html_e( 'Notify the author of follow-up replies via email', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</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="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'wporg-forums' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_subscription"><?php esc_html_e( 'Notify me of follow-up replies via email', 'wporg-forums' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,11 +200,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="bbp-form log-edit">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" <?php bbp_form_topic_log_edit(); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_log_topic_edit"><?php _e( 'Keep a log of this edit:', 'wporg-forums' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_log_topic_edit"><?php esc_html_e( 'Keep a log of this edit:', 'wporg-forums' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> </legend>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bbp_topic_edit_reason"><em><?php _e( 'Optional reason for editing:', 'wporg-forums' ); ?></em></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bbp_topic_edit_reason"><em><?php esc_html_e( 'Optional reason for editing:', 'wporg-forums' ); ?></em></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="text" value="<?php bbp_form_topic_edit_reason(); ?>" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_form_submit_button' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="submit" id="bbp_topic_submit" name="bbp_topic_submit" class="button button-primary submit"><?php _e( 'Submit', 'wporg-forums' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="submit" id="bbp_topic_submit" name="bbp_topic_submit" class="button button-primary submit"><?php esc_html_e( 'Submit', 'wporg-forums' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_form_submit_button' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'The forum ‘%s’ is closed to new topics and replies.', 'wporg-forums' ), bbp_get_forum_title() ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( esc_html__( 'The forum ‘%s’ is closed to new topics and replies.', 'wporg-forums' ), bbp_get_forum_title() ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,9 +251,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="bbp-template-notice">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'You cannot create new topics at this time.', 'wporg-forums' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'You cannot create new topics at this time.', 'wporg-forums' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'You must be <a href="%s">logged in</a> to create new topics.', 'wporg-forums' ), wp_login_url() ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php printf( esc_html__( 'You must be <a href="%s">logged in</a> to create new topics.', 'wporg-forums' ), wp_login_url() ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopforumshomepagephp"></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/themes/pub/wporg-support/bbpress/loop-forums-homepage.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/themes/pub/wporg-support/bbpress/loop-forums-homepage.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums-homepage.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,29 +1,43 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_before_forums_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Forums Loop Homepage
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums three-up">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+do_action( 'bbp_template_before_forums_loop' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_forums() ) : bbp_the_forum(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums three-up">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'single-forum-homepage' ); ?>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endwhile; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_forums() ) :
+ bbp_the_forum();
+ bbp_get_template_part( 'loop', 'single-forum-homepage' );
+ endwhile;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .forums-directory -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="themes-plugins">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <h3><?php _e( 'Themes and Plugins', 'wporg-forums' ); ?></h3>
- <p><?php
- /* translators: 1: Theme Directory URL, 2: Appearance icon, 3: Plugin Directory URL, 4: Plugins icon */
- printf( __( 'Looking for help with a specific <a href="%1$s">%2$s theme</a> or <a href="%3$s">%4$s plugin</a>? Head to the theme or plugin\'s page and find the "View support forum" link to visit the theme or plugin\'s individual forum.', 'wporg-forums' ),
- esc_url( __( 'https://wordpress.org/themes/', 'wporg-forums' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <h3><?php esc_html_e( 'Themes and Plugins', 'wporg-forums' ); ?></h3>
+ <p>
+ <?php
+ printf(
+ /* translators: 1: Theme Directory URL, 2: Appearance icon, 3: Plugin Directory URL, 4: Plugins icon */
+ esc_html__( 'Looking for help with a specific <a href="%1$s">%2$s theme</a> or <a href="%3$s">%4$s plugin</a>? Head to the theme or plugin\'s page and find the "View support forum" link to visit the theme or plugin\'s individual forum.', 'wporg-forums' ),
+ esc_url( esc_html__( 'https://wordpress.org/themes/', 'wporg-forums' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<span class="dashicons dashicons-admin-appearance"></span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( __( 'https://wordpress.org/plugins/', 'wporg-forums' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( esc_html__( 'https://wordpress.org/plugins/', 'wporg-forums' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<span class="dashicons dashicons-admin-plugins"></span>'
</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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopforumsphp"></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/themes/pub/wporg-support/bbpress/loop-forums.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/themes/pub/wporg-support/bbpress/loop-forums.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-forums.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,24 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_before_forums_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Forums Loop
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+do_action( 'bbp_template_before_forums_loop' ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-header">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="forum-titles">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="bbp-forum-info"><?php _e( 'Forum', 'wporg-forums' ); ?></li>
- <li class="bbp-forum-topic-count"><?php _e( 'Topics', 'wporg-forums' ); ?></li>
- <li class="bbp-forum-reply-count"><?php _e( 'Posts', 'wporg-forums' ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="bbp-forum-info"><?php esc_attr_e( 'Forum', 'wporg-forums' ); ?></li>
+ <li class="bbp-forum-topic-count"><?php esc_attr_e( 'Topics', 'wporg-forums' ); ?></li>
+ <li class="bbp-forum-reply-count"><?php esc_attr_e( 'Posts', 'wporg-forums' ); ?></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </li><!-- .bbp-header -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,24 +25,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-body">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_forums() ) : bbp_the_forum(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_forums() ) :
+ bbp_the_forum();
+ bbp_get_template_part( 'loop', 'single-forum' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'single-forum' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bbp_list_forums(
+ array(
+ 'before' => '',
+ 'after' => '',
+ 'link_before' => '<ul class="forum"><li class="bbp-forum-info">— <span class="bbp-forum-title">',
+ 'link_after' => '',
+ 'count_before' => '</span></li><li class="bbp-forum-reply-count">',
+ 'count_after' => '</li></ul>',
+ 'separator' => '',
+ 'show_topic_count' => false,
+ 'show_reply_count' => true,
+ )
+ );
+ endwhile;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_list_forums( array(
- 'before' => '',
- 'after' => '',
- 'link_before' => '<ul class="forum"><li class="bbp-forum-info">— <span class="bbp-forum-title">',
- 'link_after' => '',
- 'count_before' => '</span></li><li class="bbp-forum-reply-count">',
- 'count_after' => '</li></ul>',
- 'separator' => '',
- 'show_topic_count' => false,
- 'show_reply_count' => true,
- ) ); ?>
-
- <?php endwhile; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> </li><!-- .bbp-body -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-footer">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresslooppostsphp"></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/themes/pub/wporg-support/bbpress/loop-posts.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/themes/pub/wporg-support/bbpress/loop-posts.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-posts.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Posts Loop
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,14 +11,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="bbp-topics full-posts">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-body">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_topics() ) : bbp_the_topic(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_topics() ) :
+ bbp_the_topic();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'topic' == get_post_type() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'topic' === get_post_type() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'content', 'single-topic-lead' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php // This actually works. ?>
- <?php else : bbpress()->reply_query = bbpress()->topic_query; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php // This actually works. ?>
+ <?php
+ else :
+ bbpress()->reply_query = bbpress()->topic_query;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresslooprepliesphp"></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/themes/pub/wporg-support/bbpress/loop-replies.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/themes/pub/wporg-support/bbpress/loop-replies.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-replies.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,27 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_before_replies_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Replies Loop
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+do_action( 'bbp_template_before_replies_loop' ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="topic-<?php bbp_topic_id(); ?>-replies" class="forums bbp-replies">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-body">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_replies() ) : bbp_the_reply(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_replies() ) :
+ bbp_the_reply();
+ bbp_get_template_part( 'loop', 'single-reply' );
+ endwhile;
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
-
- <?php endwhile; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> </li><!-- .bbp-body -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- #topic-<?php bbp_topic_id(); ?>-replies -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopreplytopicsphp"></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/themes/pub/wporg-support/bbpress/loop-reply-topics.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/themes/pub/wporg-support/bbpress/loop-reply-topics.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-reply-topics.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,28 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_before_topics_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Reply Topics Loop
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+do_action( 'bbp_template_before_topics_loop' ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="bbp-forum-<?php bbp_forum_id(); ?>" class="bbp-topics">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="forum-titles">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-topic-title"><?php esc_html_e( 'Topic', 'wporg-forums' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-topic-voice-count"><?php esc_html_e( 'Voices', 'wporg-forums' ); ?></li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="bbp-topic-reply-count"><?php bbp_show_lead_topic()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="bbp-topic-reply-count">
+ <?php
+ bbp_show_lead_topic()
</ins><span class="cx" style="display: block; padding: 0 10px"> ? esc_html_e( 'Replies', 'wporg-forums' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- : esc_html_e( 'Posts', 'wporg-forums' );
- ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ : esc_html_e( 'Posts', 'wporg-forums' );
+ ?>
+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-topic-freshness"><?php esc_html_e( 'Last Post', 'wporg-forums' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-body">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_replies() ) : bbp_the_reply(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_replies() ) :
+ bbp_the_reply();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'loop', 'single-reply-topic' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,4 +49,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- #bbp-forum-<?php bbp_forum_id(); ?> -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_topics_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_topics_loop' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsearchphp"></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/themes/pub/wporg-support/bbpress/loop-search.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/themes/pub/wporg-support/bbpress/loop-search.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-search.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,10 +1,24 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_before_search_results_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Search Loop
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+do_action( 'bbp_template_before_search_results_loop' ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="bbp-search-results" class="forums bbp-search-results">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-body">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php while ( bbp_search_results() ) : bbp_the_search_result(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ while ( bbp_search_results() ) :
+ bbp_the_search_result();
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'topic' === get_post_type() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,4 +36,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- #bbp-search-results -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_search_results_loop' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_search_results_loop' ); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingleforumhomepagephp"></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/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.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/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum-homepage.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,20 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Single Forum Loop Homepage
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="bbp-forum-<?php bbp_forum_id(); ?>" <?php bbp_forum_class( bbp_get_forum_id(), array( '' ) ); ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><h3><?php bbp_forum_title(); ?></h3></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php bbp_forum_content(); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>" class="viewmore"><?php _e( 'View forum', 'wporg-forums' ); ?></a></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><a href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>" class="viewmore"><?php esc_html_e( 'View forum', 'wporg-forums' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #bbp-forum-<?php bbp_forum_id(); ?> -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingleforumphp"></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/themes/pub/wporg-support/bbpress/loop-single-forum.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/themes/pub/wporg-support/bbpress/loop-single-forum.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-forum.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Forums Loop - Single Forum
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="bbp-forum-<?php bbp_forum_id(); ?>" <?php bbp_forum_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-forum-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><?php bbp_forum_title(); ?></a>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsinglereplytopicphp"></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/themes/pub/wporg-support/bbpress/loop-single-reply-topic.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/themes/pub/wporg-support/bbpress/loop-single-reply-topic.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-reply-topic.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Replies Loop - Single Reply Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php $topic_id = bbp_get_reply_topic_id(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="bbp-topic-<?php bbp_topic_id( $topic_id ); ?>" <?php bbp_topic_class( $topic_id ); ?>>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,13 +31,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_started_by' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'wporg-forums' ), bbp_get_topic_author_link( array( 'post_id' => $topic_id, 'size' => '14' ) ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-started-by">
+ <?php
+ printf(
+ esc_html__( 'Started by: %1$s', 'wporg-forums' ),
+ bbp_get_topic_author_link(
+ array(
+ 'post_id' => $topic_id,
+ 'size' => '14',
+ )
+ )
+ );
+ ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-started-in"><?php printf( __( 'in: <a href="%1$s">%2$s</a>', 'wporg-forums' ), bbp_get_forum_permalink( bbp_get_topic_forum_id( $topic_id ) ), bbp_get_forum_title( bbp_get_topic_forum_id( $topic_id ) ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-started-in"><?php printf( esc_html__( 'in: <a href="%1$s">%2$s</a>', 'wporg-forums' ), bbp_get_forum_permalink( bbp_get_topic_forum_id( $topic_id ) ), bbp_get_forum_title( bbp_get_topic_forum_id( $topic_id ) ) ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_started_in' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +77,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id( $topic_id ), 'size' => 14 ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-freshness-author">
+ <?php
+ bbp_author_link(
+ array(
+ 'post_id' => bbp_get_topic_last_active_id( $topic_id ),
+ 'size' => 14,
+ )
+ );
+ ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsinglereplyphp"></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/themes/pub/wporg-support/bbpress/loop-single-reply.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/themes/pub/wporg-support/bbpress/loop-single-reply.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-reply.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Replies Loop - Single Reply
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,9 +28,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_reply_author_details' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_reply_author_link( array( 'sep' => '', 'show_role' => false, 'size' => 100 ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_reply_author_link(
+ array(
+ 'sep' => '',
+ 'show_role' => false,
+ 'size' => 100,
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_user_nicename( bbp_get_reply_author_id(), array( 'before' => '<p class="bbp-user-nicename">(@', 'after' => ')</p>' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_user_nicename(
+ bbp_get_reply_author_id(),
+ array(
+ 'before' => '<p class="bbp-user-nicename">(@',
+ 'after' => ')</p>',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'moderate', bbp_get_reply_topic_id() ) && 'bbp_blocked' === bbp_get_user_role( bbp_get_reply_author_id() ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wporg-bbp-user-is-blocked">[<?php esc_html_e( 'This user is blocked', 'wporg-support' ); ?>]</p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressloopsingletopicphp"></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/themes/pub/wporg-support/bbpress/loop-single-topic.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/themes/pub/wporg-support/bbpress/loop-single-topic.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/loop-single-topic.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Topics Loop - Single
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+// Exit if accessed directly
+defined( 'ABSPATH' ) || exit;
+
+?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="bbp-topic-<?php bbp_topic_id(); ?>" <?php bbp_topic_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="bbp-topic-title">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +23,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_favorites_action' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_user_favorites_link( array( 'before' => '', 'favorite' => '+', 'favorited' => '×' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_user_favorites_link(
+ array(
+ 'before' => '',
+ 'favorite' => '+',
+ 'favorited' => '×',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_favorites_action' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +43,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_subscription_action' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_user_subscribe_link( array( 'before' => '', 'subscribe' => '+', 'unsubscribe' => '×' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ bbp_user_subscribe_link(
+ array(
+ 'before' => '',
+ 'subscribe' => '+',
+ 'unsubscribe' => '×',
+ )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_subscription_action' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,21 +75,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_started_by' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'wporg-forums' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-started-by"><?php printf( esc_html__( 'Started by: %1$s', 'wporg-forums' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ if (
</ins><span class="cx" style="display: block; padding: 0 10px"> ( bbp_is_single_view() && ! wporg_support_is_compat_view() )
</span><span class="cx" style="display: block; padding: 0 10px"> ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( bbp_is_single_forum() && bbp_get_topic_forum_id() != bbp_get_forum_id() )
</span><span class="cx" style="display: block; padding: 0 10px"> ||
</span><span class="cx" style="display: block; padding: 0 10px"> bbp_is_single_user_topics()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-started-in"><?php printf( __( 'in: <a href="%1$s">%2$s</a>', 'wporg-forums' ), bbp_get_forum_permalink( bbp_get_topic_forum_id() ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-started-in"><?php printf( esc_html__( 'in: <a href="%1$s">%2$s</a>', 'wporg-forums' ), bbp_get_forum_permalink( bbp_get_topic_forum_id() ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_started_in' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +121,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id(), 'size' => 14 ) ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="bbp-topic-freshness-author">
+ <?php
+ bbp_author_link(
+ array(
+ 'post_id' => bbp_get_topic_last_active_id(),
+ 'size' => 14,
+ )
+ );
+ ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserdetailsphp"></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/themes/pub/wporg-support/bbpress/user-details.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/themes/pub/wporg-support/bbpress/user-details.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-details.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * User Details
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,71 +21,113 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="bbp-user-navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_single_user_profile() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_single_user_profile() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="vcard bbp-user-profile-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="url fn n" href="<?php bbp_user_profile_url(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Profile", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>" rel="me"><?php esc_html_e( 'Profile', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="url fn n" href="<?php bbp_user_profile_url(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Profile", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ " rel="me"><?php esc_html_e( 'Profile', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_single_user_topics() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_single_user_topics() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class='bbp-user-topics-created-link'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_topics_created_url(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Topics Started", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Topics Started', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_topics_created_url(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Topics Started", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Topics Started', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_single_user_replies() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_single_user_replies() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class='bbp-user-replies-created-link'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_replies_created_url(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Replies Created", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Replies Created', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_replies_created_url(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Replies Created", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Replies Created', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == get_current_blog_id() ) : ?>
- <li class="<?php if ( wporg_support_is_single_user_reviews() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID === get_current_blog_id() ) : ?>
+ <li class="
+ <?php
+ if ( wporg_support_is_single_user_reviews() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class='bbp-user-reviews-link'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_profile_url(); ?>reviews/" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Reviews Written", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Reviews Written', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_profile_url(); ?>reviews/" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Reviews Written", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Reviews Written', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( wporg_support_is_single_user_topics_replied_to() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( wporg_support_is_single_user_topics_replied_to() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class='bbp-user-topics-replied-to-link'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_profile_url(); ?>replied-to/" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( 'Topics %s Has Replied To', 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Topics Replied To', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_profile_url(); ?>replied-to/" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( 'Topics %s Has Replied To', 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Topics Replied To', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( function_exists( 'bbp_is_engagements_active' ) && bbp_is_engagements_active() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_single_user_engagements() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_single_user_engagements() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class='bbp-user-engagements-created-link'>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_engagements_url(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Engagements", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Engagements', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_engagements_url(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Engagements", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Engagements', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_favorites_active() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_favorites() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_favorites() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="bbp-user-favorites-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_favorites_permalink(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Favorites", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Favorites', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_favorites_permalink(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Favorites", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Favorites', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,22 +135,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_user_home() || current_user_can( 'edit_users' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_subscriptions_active() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_subscriptions() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_subscriptions() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="bbp-user-subscriptions-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_subscriptions_permalink(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "%s's Subscriptions", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Subscriptions', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_subscriptions_permalink(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "%s's Subscriptions", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Subscriptions', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li class="<?php if ( bbp_is_single_user_edit() ) :?>current<?php endif; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="
+ <?php
+ if ( bbp_is_single_user_edit() ) :
+ ?>
+ current<?php endif; ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="bbp-user-edit-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php bbp_user_profile_edit_url(); ?>" title="<?php
- /* translators: %s: user's display name */
- printf( esc_attr__( "Edit %s's Profile", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
- ?>"><?php esc_html_e( 'Edit', 'wporg-forums' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php bbp_user_profile_edit_url(); ?>" title="
+ <?php
+ /* translators: %s: user's display name */
+ printf( esc_attr__( "Edit %s's Profile", 'wporg-forums' ), bbp_get_displayed_user_field( 'display_name' ) );
+ ?>
+ "><?php esc_html_e( 'Edit', 'wporg-forums' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,4 +175,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_user_details' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_user_details' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserprofilephp"></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/themes/pub/wporg-support/bbpress/user-profile.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/themes/pub/wporg-support/bbpress/user-profile.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * User Profile
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,42 +10,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="bbp-user-profile" class="bbp-user-profile">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="entry-title"><?php esc_html_e( 'Profile', 'wporg-forums' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="bbp-user-section"><?php
- if ( current_user_can( 'moderate' ) && class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) {
- $displayed_user_id = bbp_get_displayed_user_id();
- $plugin_instance = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance();
- $is_user_flagged = $plugin_instance->is_user_flagged( $displayed_user_id );
- $moderator = get_user_meta( $displayed_user_id, $plugin_instance::MODERATOR_META, true );
- $moderation_date = get_user_meta( $displayed_user_id, $plugin_instance::MODERATION_DATE_META, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="bbp-user-section">
+ <?php
+ if ( current_user_can( 'moderate' ) && class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) {
+ $displayed_user_id = bbp_get_displayed_user_id();
+ $plugin_instance = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance();
+ $is_user_flagged = $plugin_instance->is_user_flagged( $displayed_user_id );
+ $moderator = get_user_meta( $displayed_user_id, $plugin_instance::MODERATOR_META, true );
+ $moderation_date = get_user_meta( $displayed_user_id, $plugin_instance::MODERATION_DATE_META, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_user_flagged ) {
- if ( $moderator && $moderation_date ) {
- $msg = sprintf(
- /* translators: 1: linked moderator's username, 2: moderation date, 3: moderation time */
- __( 'This user has been flagged by %1$s on %2$s at %3$s.', 'wporg-forums' ),
- sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator ),
- /* translators: localized date format, see https://secure.php.net/date */
- mysql2date( __( 'F j, Y', 'wporg-forums' ), $moderation_date ),
- /* translators: localized time format, see https://secure.php.net/date */
- mysql2date( __( 'g:i a', 'wporg-forums' ), $moderation_date )
- );
- } elseif ( $moderator ) {
- $msg = sprintf(
- /* translators: %s: linked moderator's username */
- __( 'This user has been flagged by %s.', 'wporg-forums' ),
- sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator )
- );
- } else {
- $msg = __( 'This user has been flagged.', 'wporg-forums' );
- }
-
- printf(
- '<div class="bbp-template-notice warning"><p>%s</p></div>',
- $msg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_user_flagged ) {
+ if ( $moderator && $moderation_date ) {
+ $msg = sprintf(
+ /* translators: 1: linked moderator's username, 2: moderation date, 3: moderation time */
+ esc_html__( 'This user has been flagged by %1$s on %2$s at %3$s.', 'wporg-forums' ),
+ sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator ),
+ /* translators: localized date format, see https://secure.php.net/date */
+ mysql2date( esc_html__( 'F j, Y', 'wporg-forums' ), $moderation_date ),
+ /* translators: localized time format, see https://secure.php.net/date */
+ mysql2date( esc_html__( 'g:i a', 'wporg-forums' ), $moderation_date )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $moderator ) {
+ $msg = sprintf(
+ /* translators: %s: linked moderator's username */
+ esc_html__( 'This user has been flagged by %s.', 'wporg-forums' ),
+ sprintf( '<a href="%s">%s</a>', esc_url( home_url( "/users/$moderator/" ) ), $moderator )
+ );
+ } else {
+ $msg = esc_html__( 'This user has been flagged.', 'wporg-forums' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ printf(
+ '<div class="bbp-template-notice warning"><p>%s</p></div>',
+ $msg
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_get_displayed_user_field( 'description' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,83 +56,105 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'moderate' ) ) : ?>
</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 class="bbp-user-email"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-email">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user's email address */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Email: %s', 'wporg-forums' ), bbp_get_displayed_user_field( 'user_email' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 class="bbp-user-wporg-profile"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-wporg-profile">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_nicename = bbp_get_displayed_user_field( 'user_nicename' );
</span><span class="cx" style="display: block; padding: 0 10px"> $slack_username = wporg_support_get_slack_username();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $slack_username && $slack_username != $user_nicename ) {
- /* translators: 1: user's WordPress.org profile link, 2: user's Slack username, 3: make.wordpress.org/chat URL */
- printf( __( '%1$s on WordPress.org, %2$s on <a href="%3$s">Slack</a>', 'wporg-forums' ),
- wporg_support_get_wporg_profile_link(),
- '@' . $slack_username,
- 'https://make.wordpress.org/chat/'
- );
- } elseif( $slack_username ) {
- /* translators: 1: WordPress.org and Slack username, 2: URL for information about Slack */
- printf( __( '%1$s on WordPress.org and <a href="%2$s">Slack</a>', 'wporg-forums' ),
- wporg_support_get_wporg_profile_link(),
- 'https://make.wordpress.org/chat/'
- );
- } else {
- /* translators: %s: user's WordPress.org profile link */
- printf( esc_html__( '%s on WordPress.org', 'wporg-forums' ),
- wporg_support_get_wporg_profile_link()
- );
- }
- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $slack_username && $slack_username !== $user_nicename ) {
+ /* translators: 1: user's WordPress.org profile link, 2: user's Slack username, 3: make.wordpress.org/chat URL */
+ printf(
+ esc_html__( '%1$s on WordPress.org, %2$s on <a href="%3$s">Slack</a>', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link(),
+ '@' . $slack_username,
+ 'https://make.wordpress.org/chat/'
+ );
+ } elseif ( $slack_username ) {
+ /* translators: 1: WordPress.org and Slack username, 2: URL for information about Slack */
+ printf(
+ esc_html__( '%1$s on WordPress.org and <a href="%2$s">Slack</a>', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link(),
+ 'https://make.wordpress.org/chat/'
+ );
+ } else {
+ /* translators: %s: user's WordPress.org profile link */
+ printf(
+ esc_html__( '%s on WordPress.org', 'wporg-forums' ),
+ wporg_support_get_wporg_profile_link()
+ );
+ }
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $custom_title = get_user_option( 'title', bbp_get_displayed_user_id() ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <p class="bbp-user-custom-title"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p class="bbp-user-custom-title">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user's custom title */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Title: %s', 'wporg-forums' ), esc_html( $custom_title ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 class="bbp-user-forum-role"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-forum-role">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user's forum role */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Forum Role: %s', 'wporg-forums' ), bbp_get_user_display_role() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() && $website = bbp_get_displayed_user_field( 'user_url' ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <p class="bbp-user-website"><?php
- /* translators: %s: link to user's website */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <p class="bbp-user-website">
+ <?php
+ /* translators: %s: link to user's website */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Website: %s', 'wporg-forums' ), sprintf( '<a href="%s">%s</a>', esc_url( $website ), esc_html( $website ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 class="bbp-user-member-since"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-member-since">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user's registration date */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Member Since: %s', 'wporg-forums' ), wporg_support_get_user_registered_date() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="bbp-user-topic-count"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-topic-count">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: number of user's topics */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Topics Started: %s', 'wporg-forums' ), number_format_i18n( wporg_support_get_user_topics_count() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="bbp-user-reply-count"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="bbp-user-reply-count">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: number of user's replies */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Replies Created: %s', 'wporg-forums' ), number_format_i18n( bbp_get_user_reply_count_raw() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID == get_current_blog_id() ) : ?>
- <p class="bbp-user-review-count"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) && WPORG_SUPPORT_FORUMS_BLOGID === get_current_blog_id() ) : ?>
+ <p class="bbp-user-review-count">
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: number of user's reviews */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( esc_html__( 'Reviews Written: %s', 'wporg-forums' ), number_format_i18n( wporg_support_get_user_reviews_count() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #bbp-author-topics-started -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_user_profile' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_user_profile' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressuserreviewswrittenphp"></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/themes/pub/wporg-support/bbpress/user-reviews-written.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/themes/pub/wporg-support/bbpress/user-reviews-written.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-reviews-written.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * User Reviews Written
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,16 +16,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</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><?php bbp_is_user_home()
- ? esc_html_e( 'You have not written any reviews.', 'wporg-forums' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ bbp_is_user_home()
+ ? esc_html_e( 'You have not written any reviews.', 'wporg-forums' )
</ins><span class="cx" style="display: block; padding: 0 10px"> : esc_html_e( 'This user has not written any reviews.', 'wporg-forums' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,4 +35,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #bbp-user-reviews-written -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_user_reviews_written' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_user_reviews_written' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressusertopicsrepliedtophp"></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/themes/pub/wporg-support/bbpress/user-topics-replied-to.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/themes/pub/wporg-support/bbpress/user-topics-replied-to.php 2018-11-01 00:08:26 UTC (rev 7812)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-topics-replied-to.php 2018-11-01 07:02:31 UTC (rev 7813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * User Topics Replied To
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,16 +16,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bbp_get_template_part( 'loop', 'reply-topics' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_get_template_part( 'loop', 'reply-topics' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</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><?php bbp_is_user_home()
- ? esc_html_e( 'You have not replied to any topics.', 'wporg-forums' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ bbp_is_user_home()
+ ? esc_html_e( 'You have not replied to any topics.', 'wporg-forums' )
</ins><span class="cx" style="display: block; padding: 0 10px"> : esc_html_e( 'This user has not replied to any topics.', 'wporg-forums' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,4 +35,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #bbp-user-topics-replied-to -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bbp_template_after_user_topics_replied_to' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+do_action( 'bbp_template_after_user_topics_replied_to' );
</ins></span></pre>
</div>
</div>
</body>
</html>