<!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][12604] trunk: Make sure activities requiring content are not inserted empty into db</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/12604">12604</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/12604","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-03-29 16:27:09 +0000 (Sun, 29 Mar 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'>Make sure activities requiring content are not inserted empty into db
The activity type `activity_update` requires a content. If it is not set (eg: this can happen after sanitization), the activity won't be inserted into the database. Plugin developers can use the `bp_activity_type_requires_content` filter to force the activity type their plugin generated to also require content.
Props oztaser
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8236">#8236</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivityactivityphp">trunk/src/bp-activity/classes/class-bp-activity-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp">trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivityactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-activity.php 2020-03-29 16:09:52 UTC (rev 12603)
+++ trunk/src/bp-activity/classes/class-bp-activity-activity.php 2020-03-29 16:27:09 UTC (rev 12604)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,9 +268,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->component ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->errors->add( 'bp_activity_missing_component' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors->add( 'bp_activity_missing_component', __( 'You need to define a component parameter to insert activity.', 'buddypress' ) );
</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">- $this->errors->add( 'bp_activity_missing_type' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors->add( 'bp_activity_missing_type', __( 'You need to define a type parameter to insert activity.', '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"> return $this->errors;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,6 +277,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Use this filter to make the content of your activity required.
+ *
+ * @since 6.0.0
+ *
+ * @param bool $value True if the content of the activity type is required.
+ * False otherwise.
+ * @param string $type The type of the activity we are about to insert.
+ */
+ $type_requires_content = (bool) apply_filters( 'bp_activity_type_requires_content', $this->type === 'activity_update', $this->type );
+ if ( $type_requires_content && ! $this->content ) {
+ if ( 'bool' === $this->error_type ) {
+ return false;
+ } else {
+ $this->errors->add( 'bp_activity_missing_content', __( 'Please enter some content to post.', 'buddypress' ) );
+
+ return $this->errors;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->primary_link ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->primary_link = bp_loggedin_user_domain();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2020-03-29 16:09:52 UTC (rev 12603)
+++ trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php 2020-03-29 16:27:09 UTC (rev 12604)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,4 +785,92 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function action_cb( $activity ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'Woo Hoo!';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket BP8236
+ */
+ public function test_save_activity_requires_component() {
+ $a = bp_activity_add(
+ array(
+ 'component' => '',
+ 'content' => 'Activity without component content %s',
+ 'type' => 'activity_update',
+ 'error_type' => 'wp_error',
+ )
+ );
+
+ $this->assertInstanceOf( 'WP_Error', $a );
+ $this->assertEquals( 'bp_activity_missing_component', $a->get_error_code() );
+ }
+
+ /**
+ * @ticket BP8236
+ */
+ public function test_save_activity_requires_type() {
+ $a = bp_activity_add(
+ array(
+ 'component' => 'foobar',
+ 'content' => 'Activity without type content %s',
+ 'type' => '',
+ 'error_type' => 'wp_error',
+ )
+ );
+
+ $this->assertInstanceOf( 'WP_Error', $a );
+ $this->assertEquals( 'bp_activity_missing_type', $a->get_error_code() );
+ }
+
+ /**
+ * @ticket BP8236
+ */
+ public function test_save_activity_requires_content() {
+ $a = bp_activity_add(
+ array(
+ 'component' => buddypress()->activity->id,
+ 'content' => '',
+ 'type' => 'activity_update',
+ 'error_type' => 'wp_error',
+ )
+ );
+
+ $this->assertInstanceOf( 'WP_Error', $a );
+ $this->assertEquals( 'bp_activity_missing_content', $a->get_error_code() );
+ }
+
+ /**
+ * @ticket BP8236
+ */
+ public function test_save_activity_does_not_require_content() {
+ $a = bp_activity_add(
+ array(
+ 'component' => buddypress()->members->id,
+ 'content' => '',
+ 'type' => 'new_member',
+ 'error_type' => 'wp_error',
+ )
+ );
+
+ $this->assertFalse( is_wp_error( $a ) );
+ }
+
+ /**
+ * @ticket BP8236
+ */
+ public function test_save_activity_custom_type_requires_content() {
+ add_filter( 'bp_activity_type_requires_content', '__return_true' );
+
+ $a = bp_activity_add(
+ array(
+ 'component' => 'foo',
+ 'content' => '',
+ 'type' => 'bar',
+ 'error_type' => 'wp_error',
+ )
+ );
+
+ remove_filter( 'bp_activity_type_requires_content', '__return_true' );
+
+ $this->assertInstanceOf( 'WP_Error', $a );
+ $this->assertEquals( 'bp_activity_missing_content', $a->get_error_code() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>