<!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][12149] branches/3.0/src/bp-templates/bp-nouveau: BP Nouveau Activity comment form: allow inputs to be added to the form</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/12149">12149</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/12149","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>2018-05-30 16:59:34 +0000 (Wed, 30 May 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'>BP Nouveau Activity comment form: allow inputs to be added to the form
In BP Legacy, the hook {{{bp_activity_entry_comments}}} is fired inside the activity comment form, letting plugin developers inject custom inputs into this form. The same hook is also available in BP Nouveau but was misplaced out of the comment form.
To adapt to one of this Nouveau principle: try to avoid adding hooks directly into templates using existing template tags or specific wrappers and preserve the same level of customization plugin developers need, we will use the {{{bp_nouveau_submit_button()}}} template tag to wrap and fire this hook into its output.
Props sbrajesh
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7839">#7839</a> (Branch 3.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30srcbptemplatesbpnouveaubuddypressactivitycommentformphp">branches/3.0/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveauincludesactivitytemplatetagsphp">branches/3.0/src/bp-templates/bp-nouveau/includes/activity/template-tags.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveauincludesfunctionsphp">branches/3.0/src/bp-templates/bp-nouveau/includes/functions.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveauincludestemplatetagsphp">branches/3.0/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30srcbptemplatesbpnouveaubuddypressactivitycommentformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/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">--- branches/3.0/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php 2018-05-30 16:55:10 UTC (rev 12148)
+++ branches/3.0/src/bp-templates/bp-nouveau/buddypress/activity/comment-form.php 2018-05-30 16:59:34 UTC (rev 12149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,16 +20,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_nouveau_submit_button( 'activity-new-comment' );
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<input type="submit" name="ac_form_submit" value="%s" /> <button type="button" class="ac-reply-cancel">%s</button>',
- esc_attr( _x( 'Post', 'button', 'buddypress' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ' <button type="button" class="ac-reply-cancel">%s</button>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( _x( 'Cancel', 'button', 'buddypress' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="comment_form_id" value="<?php bp_activity_id(); ?>" />
</del><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 wp_nonce_field( 'new_activity_comment', '_wpnonce_new_activity_comment' ); ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> </form>
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveauincludesactivitytemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/includes/activity/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/includes/activity/template-tags.php 2018-05-30 16:55:10 UTC (rev 12148)
+++ branches/3.0/src/bp-templates/bp-nouveau/includes/activity/template-tags.php 2018-05-30 16:59:34 UTC (rev 12149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,13 +695,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_activity_comment_form() {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_get_template_part( 'activity/comment-form' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Fires after the activity entry comment form.
- *
- * @since 1.5.0
- */
- do_action( 'bp_activity_entry_comments' );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveauincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/includes/functions.php 2018-05-30 16:55:10 UTC (rev 12148)
+++ branches/3.0/src/bp-templates/bp-nouveau/includes/functions.php 2018-05-30 16:59:34 UTC (rev 12149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,6 +1321,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'auto',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'activity-new-comment' => array(
+ 'after' => 'bp_activity_entry_comments',
+ 'nonce' => 'new_activity_comment',
+ 'nonce_key' => '_wpnonce_new_activity_comment',
+ 'wrapper' => false,
+ 'attributes' => array(
+ 'name' => 'ac_form_submit',
+ 'value' => _x( 'Post', 'button', 'buddypress' ),
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $actions[ $action ] ) ) {
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveauincludestemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/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">--- branches/3.0/src/bp-templates/bp-nouveau/includes/template-tags.php 2018-05-30 16:55:10 UTC (rev 12148)
+++ branches/3.0/src/bp-templates/bp-nouveau/includes/template-tags.php 2018-05-30 16:59:34 UTC (rev 12149)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2419,16 +2419,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( $submit_data['before'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Output the submit button.
- printf(
- '<div class="submit">
- <input type="submit" %s/>
- </div>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit_input = sprintf( '<input type="submit" %s/>',
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_get_form_field_attributes( 'submit', $submit_data['attributes'] ) // Safe.
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_nonce_field( $submit_data['nonce'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Output the submit button.
+ if ( isset( $submit_data['wrapper'] ) && false === $submit_data['wrapper'] ) {
+ echo $submit_input;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Output the submit button into a wrapper.
+ } else {
+ printf( '<div class="submit">%s</div>', $submit_input );
+ }
+
+ if ( empty( $submit_data['nonce_key'] ) ) {
+ wp_nonce_field( $submit_data['nonce'] );
+ } else {
+ wp_nonce_field( $submit_data['nonce'], $submit_data['nonce_key'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $submit_data['after'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>