Changeset 5103

Timestamp:

03/07/2017 04:16:06 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Remove bb_base_before_topics_loop() and bb_base_after_topics_loop() introduced in [3730].

Move the modifications to content-archive-topic.php template instead.

See #2463.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support

Files:

• bbpress/content-archive-topic.php (modified) (1 diff)
• functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-archive-topic.php

@@ -9 +9 @@
 <?php endif; ?>
 
+<?php bbp_breadcrumb(); ?>
+
+<?php if ( bbp_is_topic_tag() ) : ?>
+
+    <header id="topic-tag" class="page-header bbp-topic-tag">
+        <h1 class="page-title"><?php printf( esc_html__( 'Topic Tag: %s', 'bbpress' ), '<span>' . bbp_get_topic_tag_name() . '</span>' ); ?></h1>
+        <?php bbp_topic_tag_description(); ?>
+    </header>
+
+<?php endif; ?>
+
 <div id="bbpress-forums">
-
-    <?php if ( bbp_is_topic_tag() ) bbp_topic_tag_description(); ?>
 
     <?php do_action( 'bbp_template_before_topics_index' ); ?>
 
     <?php if ( bbp_has_topics() ) : ?>
+
+        <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
 
         <?php bbp_get_template_part( 'loop',       'topics'    ); ?>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -676 +676 @@
 }
 
-function bb_base_before_topics_loop() {
-    do_action( 'bbp_template_notices' );
-
-    if ( ! is_tax( 'topic-tag' ) ) {
-        return;
-    }
-
-    bbp_breadcrumb();
-    ?>
-    <header id="topic-tag" class="page-header bbp-topic-tag">
-        <h1 class="page-title"><?php printf( esc_html__( 'Topic Tag: %s', 'bbpress' ), '<span>' . bbp_get_topic_tag_name() . '</span>' ); ?></h1>
-    </header>
-    <?php bbp_get_template_part( 'pagination', 'topics' ); ?>
-        <div class="entry-content">
-    <?php
-}
-add_action( 'bbp_template_before_topics_loop', 'bb_base_before_topics_loop' );
-
-function bb_base_after_topics_loop() {
-    if ( ! is_tax( 'topic-tag' ) ) {
-        return;
-    }
-    ?>
-        </div>
-    <?php
-}
-add_action( 'bbp_template_after_topics_loop', 'bb_base_after_topics_loop' );
-
 function bb_is_intl_forum() {
     return get_locale() != 'en_US';