<!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>[BuddyPress][12735] trunk/src/bp-templates: Templates: avoid duplicate IDs into comment form nonce field</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://buddypress.trac.wordpress.org/changeset/12735">12735</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12735","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-25 19:15:20 +0000 (Fri, 25 Sep 2020)</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'>Templates: avoid duplicate IDs into comment form nonce field
We now include the Activity ID to the `id` attribute of the input tag generated for the nonce field used into the Activity comment form. This makes sure to avoid duplicate IDs when multiple activities are displayed on the activity pages.
Props dcavins
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8004">#8004</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressactivityentryphp">trunk/src/bp-templates/bp-legacy/buddypress/activity/entry.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacyjsbuddypressjs">trunk/src/bp-templates/bp-legacy/js/buddypress.js</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressactivitycommentformphp">trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaujsbuddypressactivityjs">trunk/src/bp-templates/bp-nouveau/js/buddypress-activity.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbplegacybuddypressactivityentryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/activity/entry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/activity/entry.php 2020-09-25 03:13:24 UTC (rev 12734)
+++ trunk/src/bp-templates/bp-legacy/buddypress/activity/entry.php 2020-09-25 19:15:20 UTC (rev 12735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_activity_entry_comments' ); ?>
</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 wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment_' . bp_get_activity_id() ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/js/buddypress.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/js/buddypress.js 2020-09-25 03:13:24 UTC (rev 12734)
+++ trunk/src/bp-templates/bp-legacy/js/buddypress.js 2020-09-25 19:15:20 UTC (rev 12735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,7 +610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ajaxdata = {
</span><span class="cx" style="display: block; padding: 0 10px"> action: 'new_activity_comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cookie': bp_get_cookies(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '_wpnonce_new_activity_comment': jq('#_wpnonce_new_activity_comment').val(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '_wpnonce_new_activity_comment': jq('#_wpnonce_new_activity_comment' + '_' + comment_id ).val(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_id': comment_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'form_id': form_id[2],
</span><span class="cx" style="display: block; padding: 0 10px"> 'content': content.val()
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressactivitycommentformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php 2020-09-25 03:13:24 UTC (rev 12734)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php 2020-09-25 19:15:20 UTC (rev 12735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
</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">- bp_nouveau_submit_button( 'activity-new-comment' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_nouveau_submit_button( 'activity-new-comment', bp_get_activity_id() );
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' <button type="button" class="ac-reply-cancel">%s</button>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( _x( 'Cancel', 'button', 'buddypress' ) )
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludestemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2020-09-25 03:13:24 UTC (rev 12734)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2020-09-25 19:15:20 UTC (rev 12735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2585,7 +2585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action The action to get the submit button for. Required.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_nouveau_submit_button( $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_nouveau_submit_button( $action, $object_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $submit_data = bp_nouveau_get_submit_button( $action );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $submit_data['attributes'] ) || empty( $submit_data['nonce'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2619,6 +2619,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $submit_data['nonce_key'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( $submit_data['nonce'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $object_id ) {
+ $submit_data['nonce_key'] .= '_' . (int) $object_id;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( $submit_data['nonce'], $submit_data['nonce_key'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaujsbuddypressactivityjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/js/buddypress-activity.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/js/buddypress-activity.js 2020-09-25 03:13:24 UTC (rev 12734)
+++ trunk/src/bp-templates/bp-nouveau/js/buddypress-activity.js 2020-09-25 19:15:20 UTC (rev 12735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* jshint browser: true */
</span><span class="cx" style="display: block; padding: 0 10px"> /* global bp, BP_Nouveau */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* @version 3.1.0 */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* @since 3.0.0 */
+/* @version 7.0.0 */
</ins><span class="cx" style="display: block; padding: 0 10px"> window.bp = window.bp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( exports, $ ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,7 +736,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> comment_data = {
</span><span class="cx" style="display: block; padding: 0 10px"> action : 'new_activity_comment',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _wpnonce_new_activity_comment : $( '#_wpnonce_new_activity_comment' ).val(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _wpnonce_new_activity_comment : $( '#_wpnonce_new_activity_comment' + '_' + item_id ).val(),
</ins><span class="cx" style="display: block; padding: 0 10px"> comment_id : item_id,
</span><span class="cx" style="display: block; padding: 0 10px"> form_id : activity_id,
</span><span class="cx" style="display: block; padding: 0 10px"> content : comment_content.val()
</span></span></pre>
</div>
</div>
</body>
</html>