Changeset 9369

Timestamp:

01/17/2015 04:46:05 AM (10 years ago)

Author:

imath

Message:

Fix notice errors when an activity is generated for a post having no title.

Post types activities are using dynamic action strings when the activity is displayed in the stream and when the activity is saved into the database. In this particular case, once the post is published, we are "faking" an activity object to which we add two extra properties : the post_title and the post_url. To avoid switching blogs too many times, we are saving the post title into an activity meta. To know if we must build the action string for insert or display, we are checking the post_title property of the activity object. When a post is published without a title, the empty() check was not right. Changing for an isset() check prevents the notice errors.

props boonebgorges

Fixes #6119

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-activity.php (modified) (2 diffs)
• tests/phpunit/testcases/blogs/activity.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-activity.php

@@ -118 +118 @@
     }
 
-    if ( empty( $activity->post_url ) ) {
+    /**
+     * When the post is published we are faking an activity object
+     * to which we add 2 properties :
+     * - the post url
+     * - the post title
+     * This is done to build the 'post link' part of the activity
+     * action string.
+     * NB: in this case the activity has not yet been created.
+     */
+    if ( isset( $activity->post_url ) ) {
+        $post_url = $activity->post_url;
+
+    /**
+     * The post_url property is not set, we need to build the url
+     * thanks to the post id which is also saved as the secondary
+     * item id property of the activity object.
+     */
+    } else {
         $post_url = add_query_arg( 'p', $activity->secondary_item_id, trailingslashit( $blog_url ) );
-    } else {
-        $post_url = $activity->post_url;
-    }
-
-    if ( empty( $activity->post_title ) ) {
+    }
+
+    // Should be the case when the post has just been published
+    if ( isset( $activity->post_title ) ) {
+        $post_title = $activity->post_title;
+
+    // If activity already exists try to get the post title from activity meta
+    } else if ( ! empty( $activity->id ) ) {
         $post_title = bp_activity_get_meta( $activity->id, 'post_title' );
-    } else {
-        $post_title = $activity->post_title;
-    }
-
-    // Should only be empty at the time of post creation
+    }
+
+    /**
+     * In case the post was published without a title
+     * or the activity meta was not found
+     */
     if ( empty( $post_title ) ) {
+        // Defaults to no title
+        $post_title = esc_html__( '(no title)', 'buddypress' );
+
         switch_to_blog( $activity->item_id );
 
         $post = get_post( $activity->secondary_item_id );
         if ( is_a( $post, 'WP_Post' ) ) {
-            $post_title = $post->post_title;
-            bp_activity_update_meta( $activity->id, 'post_title', $post_title );
+            // Does the post have a title ?
+            if ( ! empty( $post->post_title ) ) {
+                $post_title = $post->post_title;
+            }
+
+            // Make sure the activity exists before saving the post title in activity meta
+            if ( ! empty( $activity->id ) ) {
+                bp_activity_update_meta( $activity->id, 'post_title', $post_title );
+            }
         }
 
@@ -143 +174 @@
     }
 
+    // Build the 'post link' part of the activity action string
     $post_link  = '<a href="' . $post_url . '">' . $post_title . '</a>';
 
     $user_link = bp_core_get_userlink( $activity->user_id );
 
+    // Build the complete activity action string
     if ( is_multisite() ) {
         $action  = sprintf( __( '%1$s wrote a new post, %2$s, on the site %3$s', 'buddypress' ), $user_link, $post_link, '<a href="' . esc_url( $blog_url ) . '">' . esc_html( $blog_name ) . '</a>' );

trunk/tests/phpunit/testcases/blogs/activity.php

@@ -311 +311 @@
 
     /**
+     * @group activity_action
+     * @group bp_blogs_format_activity_action_new_blog_post
+     */
+    public function test_bp_blogs_format_activity_action_new_blog_post_no_title() {
+        if ( is_multisite() ) {
+            return;
+        }
+
+        $bp = buddypress();
+        $activity_actions = $bp->activity->actions;
+        $bp->activity->actions = new stdClass();
+
+        $u = $this->factory->user->create();
+        $p = wp_insert_post( array(
+            'post_author' => $u,
+            'post_title'  => '', // no title: the object of the test
+            'post_status' => 'publish',
+            'post_content' => 'foo bar',
+        ) );
+
+        $user_link = bp_core_get_userlink( $u );
+        $blog_url = get_home_url();
+        $post_url = add_query_arg( 'p', $p, trailingslashit( $blog_url ) );
+        $post_link = '<a href="' . $post_url . '">(no title)</a>';
+
+        // Set activity actions
+        bp_activity_get_actions();
+
+        $a_obj = bp_activity_get( array(
+            'item_id'           => 1,
+            'secondary_item_id' => $p,
+        ) );
+
+        $expected = sprintf( '%s wrote a new post, %s', $user_link, $post_link );
+
+        $this->assertSame( $expected, $a_obj['activities'][0]->action );
+
+        // Reset activity actions
+        $bp->activity->actions = $activity_actions;
+        $bp->activity->track = array();
+    }
+
+    /**
+     * @group activity_action
+     * @group bp_blogs_format_activity_action_new_blog_post
+     */
+    public function test_bp_blogs_format_activity_action_new_blog_post_updated_without_title() {
+        if ( is_multisite() ) {
+            return;
+        }
+
+        $bp = buddypress();
+        $activity_actions = $bp->activity->actions;
+        $bp->activity->actions = new stdClass();
+
+        $u = $this->factory->user->create();
+        $p = wp_insert_post( array(
+            'post_author' => $u,
+            'post_title'  => 'foo',
+            'post_status' => 'publish',
+            'post_content' => 'foo bar',
+        ) );
+
+        $user_link  = bp_core_get_userlink( $u );
+        $blog_url   = get_home_url();
+        $post_url   = add_query_arg( 'p', $p, trailingslashit( $blog_url ) );
+        $post_title = get_the_title( $p );
+        $post_link  = '<a href="' . $post_url . '">' . $post_title . '</a>';
+
+        // Set actions
+        bp_activity_get_actions();
+
+        $a_obj = bp_activity_get( array(
+            'item_id'           => 1,
+            'secondary_item_id' => $p,
+        ) );
+
+        $expected = sprintf( '%s wrote a new post, %s', $user_link, $post_link );
+
+        $this->assertSame( $expected, $a_obj['activities'][0]->action );
+
+        // Update the post by removing its title
+        wp_update_post( array(
+            'ID'         => $p,
+            'post_title' => '',
+        ) );
+
+        // we now expect the (no title) post link
+        $post_link = '<a href="' . $post_url . '">(no title)</a>';
+        $expected = sprintf( '%s wrote a new post, %s', $user_link, $post_link );
+
+        $a_obj = bp_activity_get( array(
+            'item_id'           => 1,
+            'secondary_item_id' => $p,
+        ) );
+
+        $this->assertSame( $expected, $a_obj['activities'][0]->action );
+
+        // Reset activity actions
+        $bp->activity->actions = $activity_actions;
+        $bp->activity->track = array();
+    }
+
+    /**
      * Dopey passthrough method so we can check that the correct values
      * are being passed to the filter