Changeset 3855 for branches/plugin/bbp-includes/bbp-forum-template.php

Timestamp:

04/28/2012 10:25:50 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Improve forum and topic description texts to include empty cases.

File:

• branches/plugin/bbp-includes/bbp-forum-template.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-forum-template.php

@@ -1829 +1829 @@
         remove_filter( 'bbp_get_forum_permalink', 'bbp_add_view_all' );
 
-        // Build the forum description
-        $topic_count = bbp_get_forum_topics_link   ( $forum_id );
-        $reply_count = bbp_get_forum_reply_count   ( $forum_id );
-        $time_since  = bbp_get_forum_freshness_link( $forum_id );
-
-        // Singlular/Plural
-        $reply_count     = sprintf( _n( '%s reply', '%s replies', $reply_count, 'bbpress' ), $reply_count );
-
-        // Forum has posts
-        $last_reply = bbp_get_forum_last_active_id( $forum_id );
-        if ( !empty( $last_reply ) ) {
-
-            // Freshness author
-            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_reply, 'size' => $size ) );
-
-            // Category
-            if ( bbp_is_forum_category( $forum_id ) ) {
-                $retstr = sprintf( __( 'This category contains %1$s and %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $topic_count, $reply_count, $last_updated_by, $time_since );
-
-            // Forum
-            } else {
-                $retstr = sprintf( __( 'This forum contains %1$s and %2$s, and was last updated by %3$s %4$s.',    'bbpress' ), $topic_count, $reply_count, $last_updated_by, $time_since );
-            }
+        // Get some forum data
+        $topic_count = bbp_get_forum_topic_count( $forum_id );
+        $reply_count = bbp_get_forum_reply_count( $forum_id );
+        $last_active = bbp_get_forum_last_active_id( $forum_id );
+
+        // Has replies
+        if ( !empty( $reply_count ) ) {
+            $reply_text = sprintf( _n( '%s reply', '%s replies', $reply_count, 'bbpress' ), $reply_count );
+        }
+
+        // Forum has active data
+        if ( !empty( $last_active ) ) {
+            $topic_text      = bbp_get_forum_topics_link( $forum_id );
+            $time_since      = bbp_get_forum_freshness_link( $forum_id );
+            $last_updated_by = bbp_get_author_link( array( 'post_id' => $last_active, 'size' => $size ) );
 
         // Forum has no last active data
         } else {
-
-            // Category
-            if ( bbp_is_forum_category( $forum_id ) ) {
-                $retstr = sprintf( __( 'This category contains %1$s and %2$s.', 'bbpress' ), $topic_count, $reply_count );
-
-            // Forum
+            $topic_text      = sprintf( _n( '%s topic', '%s topics', $topic_count, 'bbpress' ), $topic_count );
+        }
+
+        // Forum has active data
+        if ( !empty( $last_active ) ) {
+
+            if ( !empty( $reply_count ) ) {
+
+                if ( bbp_is_forum_category( $forum_id ) ) {
+                    $retstr = sprintf( __( 'This category contains %1$s and %2$s, and was last updated by %3$s %4$s.', 'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
+                } else {
+                    $retstr = sprintf( __( 'This forum contains %1$s and %2$s, and was last updated by %3$s %4$s.',    'bbpress' ), $topic_text, $reply_text, $last_updated_by, $time_since );
+                }
+
             } else {
-                $retstr = sprintf( __( 'This forum contains %1$s and %2$s.',    'bbpress' ), $topic_count, $reply_count );
+
+                if ( bbp_is_forum_category( $forum_id ) ) {
+                    $retstr = sprintf( __( 'This category contains %1$s, and was last updated by %2$s %3$s.', 'bbpress' ), $topic_text, $last_updated_by, $time_since );
+                } else {
+                    $retstr = sprintf( __( 'This forum contains %1$s, and was last updated by %2$s %3$s.',    'bbpress' ), $topic_text, $last_updated_by, $time_since );
+                }
+            }
+
+        // Forum has no last active data
+        } else {
+
+            if ( !empty( $reply_count ) ) {
+
+                if ( bbp_is_forum_category( $forum_id ) ) {
+                    $retstr = sprintf( __( 'This category contains %1$s and %2$s.', 'bbpress' ), $topic_text, $reply_text );
+                } else {
+                    $retstr = sprintf( __( 'This forum contains %1$s and %2$s.',    'bbpress' ), $topic_text, $reply_text );
+                }
+
+            } else {
+
+                if ( !empty( $topic_count ) ) {
+
+                    if ( bbp_is_forum_category( $forum_id ) ) {
+                        $retstr = sprintf( __( 'This category contains %1$s.', 'bbpress' ), $topic_text );
+                    } else {
+                        $retstr = sprintf( __( 'This forum contains %1$s.',    'bbpress' ), $topic_text );
+                    }
+
+                } else {
+                    $retstr = __( 'This forum is empty.', 'bbpress' );
+                }
             }
         }