Changeset 6488

Timestamp:

06/04/2017 10:30:35 PM (8 years ago)

Author:

johnjamesjacoby

Message:

BuddyPress: Only wrap titles in h2 tags if they are not empty.

Allows easier overriding if titles are not desired at all.

See #3105.

File:

• trunk/src/includes/extend/buddypress/groups.php (modified) (3 diffs)

trunk/src/includes/extend/buddypress/groups.php

@@ -887 +887 @@
 
                         // Setup the forum
-                        bbp_the_forum(); ?>
-
-                        <h2><?php bbp_forum_title(); ?></h2>
-
-                        <?php bbp_get_template_part( 'content', 'single-forum' );
+                        bbp_the_forum();
+
+                        // Only wrap title in H2 if not empty
+                        $title = bbp_get_forum_title();
+                        if ( ! empty( $title ) ) {
+                            echo '<h2>' . $title . '</h2>';
+                        }
+
+                        // Output forum
+                        bbp_get_template_part( 'content', 'single-forum' );
 
                     // No forums found
@@ -920 +925 @@
                     // If no topic, 404
                     if ( ! bbp_topics() ) {
-                        bp_do_404( bbp_get_forum_permalink( $forum_id ) ); ?>
-                        <h2><?php bbp_forum_title(); ?></h2>
-                        <?php bbp_get_template_part( 'feedback', 'no-topics' );
+                        bp_do_404( bbp_get_forum_permalink( $forum_id ) );
+
+                        // Only wrap title in H2 if not empty
+                        $title = bbp_get_forum_title();
+                        if ( ! empty( $title ) ) {
+                            echo '<h2>' . $title . '</h2>';
+                        }
+
+                        // No topics
+                        bbp_get_template_part( 'feedback', 'no-topics' );
                         break;
                     }
 
                     // Setup the topic
-                    bbp_the_topic(); ?>
-
-                    <h2><?php bbp_topic_title(); ?></h2>
-
-                    <?php
+                    bbp_the_topic();
+
+                    // Only wrap title in H2 if not empty
+                    $title = bbp_get_topic_title();
+                    if ( ! empty( $title ) ) {
+                        echo '<h2>' . $title . '</h2>';
+                    }
 
                     // Topic edit
@@ -982 +996 @@
                     // If no topic, 404
                     if ( ! bbp_replies() ) {
-                        bp_do_404( bbp_get_forum_permalink( $forum_id ) ); ?>
-                        <h2><?php bbp_forum_title(); ?></h2>
-                        <?php bbp_get_template_part( 'feedback', 'no-replies' );
+                        bp_do_404( bbp_get_forum_permalink( $forum_id ) );
+
+                        // Only wrap title in H2 if not empty
+                        $title = bbp_get_forum_title();
+                        if ( ! empty( $title ) ) {
+                            echo '<h2>' . $title . '</h2>';
+                        }
+
+                        // No replies
+                        bbp_get_template_part( 'feedback', 'no-replies' );
                         break;
                     }
 
                     // Setup the reply
-                    bbp_the_reply(); ?>
-
-                    <h2><?php bbp_reply_title(); ?></h2>
-
-                    <?php if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_rewrite_id() ) :
+                    bbp_the_reply();
+
+                    // Only wrap title in H2 if not empty
+                    $title = bbp_get_reply_title();
+                    if ( ! empty( $title ) ) {
+                        echo '<h2>' . $title . '</h2>';
+                    }
+
+                    if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_rewrite_id() ) :
 
                         // Set the edit switches