Ticket #2981: 2981.001.patch

buddypress/bp-blogs/bp-blogs-templatetags.php

@@ -83 +83 @@
                 if ( $this->current_blog + 1 < $this->blog_count ) {
                         return true;
                 } elseif ( $this->current_blog + 1 == $this->blog_count ) {
-                        do_action('loop_end');
+                        do_action('blog_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_blogs();
                 }
@@ -99 +99 @@
                 $this->blog = $this->next_blog();
 
                 if ( 0 == $this->current_blog ) // loop has just started
-                        do_action('loop_start');
+                        do_action('blog_loop_start');
         }
 }
 

buddypress/bp-core/bp-core-templatetags.php

@@ -86 +86 @@
                 if ( $this->current_member + 1 < $this->member_count ) {
                         return true;
                 } elseif ( $this->current_member + 1 == $this->member_count ) {
-                        do_action('loop_end');
+                        do_action('member_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_members();
                 }
@@ -102 +102 @@
                 $this->member = $this->next_member();
 
                 if ( 0 == $this->current_member ) // loop has just started
-                        do_action('loop_start');
+                        do_action('member_loop_start');
         }
 }
 

buddypress/bp-forums/bp-forums-templatetags.php

@@ -139 +139 @@
                 if ( $this->current_topic + 1 < $this->topic_count ) {
                         return true;
                 } elseif ( $this->current_topic + 1 == $this->topic_count ) {
-                        do_action('loop_end');
+                        do_action('forum_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_topics();
                 }
@@ -156 +156 @@
                 $this->topic = (object)$this->topic;
 
                 if ( $this->current_topic == 0 ) // loop has just started
-                        do_action('loop_start');
+                        do_action('forum_loop_start');
         }
 }
 
@@ -798 +798 @@
                 if ( $this->current_post + 1 < $this->post_count ) {
                         return true;
                 } elseif ( $this->current_post + 1 == $this->post_count ) {
-                        do_action('loop_end');
+                        do_action('topic_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_posts();
                 }
@@ -815 +815 @@
                 $this->post = (object)$this->post;
 
                 if ( $this->current_post == 0 ) // loop has just started
-                        do_action('loop_start');
+                        do_action('topic_loop_start');
         }
 }
 

buddypress/bp-groups/bp-groups-templatetags.php

@@ -105 +105 @@
                 if ( $this->current_group + 1 < $this->group_count ) {
                         return true;
                 } elseif ( $this->current_group + 1 == $this->group_count ) {
-                        do_action('loop_end');
+                        do_action('group_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_groups();
                 }
@@ -124 +124 @@
                         $this->group = new BP_Groups_Group( $this->group->group_id );
 
                 if ( 0 == $this->current_group ) // loop has just started
-                        do_action('loop_start');
+                        do_action('group_loop_start');
         }
 }
 
@@ -2066 +2066 @@
                 if ( $this->current_request + 1 < $this->request_count ) {
                         return true;
                 } elseif ( $this->current_request + 1 == $this->request_count ) {
-                        do_action('loop_end');
+                        do_action('group_request_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_requests();
                 }
@@ -2082 +2082 @@
                 $this->request = $this->next_request();
 
                 if ( 0 == $this->current_request ) // loop has just started
-                        do_action('loop_start');
+                        do_action('group_request_loop_start');
         }
 }
 

buddypress/bp-messages/bp-messages-templatetags.php

@@ -99 +99 @@
                 if ( $this->current_thread + 1 < $this->thread_count ) {
                         return true;
                 } elseif ( $this->current_thread + 1 == $this->thread_count ) {
-                        do_action('loop_end');
+                        do_action('messages_box_loop_end');
                         // Do some cleaning up after the loop
                         $this->rewind_threads();
                 }
@@ -143 +143 @@
                 $this->thread->last_message_content = $this->thread->messages[$last_message_index]->message;
 
                 if ( 0 == $this->current_thread ) // loop has just started
-                        do_action('loop_start');
+                        do_action('messages_box_loop_start');
         }
 }