Changeset 3232 for trunk/bp-forums/bp-forums-templatetags.php

Timestamp:

09/06/2010 04:24:57 PM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

• trunk/bp-forums/bp-forums-templatetags.php (modified) (2 diffs)

trunk/bp-forums/bp-forums-templatetags.php

@@ -290 +290 @@
         global $forum_template;
 
-        $poster_id = ( empty( $forum_template->topic->poster_id ) ) ? $forum_template->topic->topic_poster : $forum_template->topic->poster_id;
-
-        if ( !$name = bp_core_get_userlink( $poster_id ) )
+        if ( !$name = bp_core_get_userlink( $forum_template->topic->poster_id ) )
             return __( 'Deleted User', 'buddypress' );
 
@@ -464 +462 @@
         global $forum_template;
 
-        return apply_filters( 'bp_get_the_topic_total_posts', $forum_template->topic->topic_posts );
+        return $forum_template->topic->topic_posts;
     }