Changeset 5664 for trunk/bp-activity/bp-activity-actions.php

Timestamp:

01/28/2012 09:38:27 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix incorrect sanity check in bp_activity_action_post_comment() causing conflict with bbPress reply editing.

File:

• trunk/bp-activity/bp-activity-actions.php (modified) (4 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -231 +231 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @uses is_user_logged_in()
  * @uses bp_is_activity_component()
@@ -249 +248 @@
  */
 function bp_activity_action_post_update() {
-        global $bp;
 
         // Do not proceed if user is not logged in, not viewing activity, or not posting
@@ -300 +298 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @uses is_user_logged_in()
  * @uses bp_is_activity_component()
@@ -315 +312 @@
  */
 function bp_activity_action_post_comment() {
-        global $bp;
-
-        if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'reply' ) )
+
+        if ( !is_user_logged_in() || !bp_is_activity_component() || !bp_is_current_action( 'reply' ) )
                 return false;