Ticket #7923: 7923.2.patch

src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php

@@ -3 +3 @@
  * BuddyPress - Groups Cover Image Header.
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 ?>
 
@@ -55 +55 @@
 
 </div><!-- #cover-image-container -->
 
-<?php if ( ! bp_nouveau_groups_front_page_description() ) : ?>
-        <?php if ( ! empty( bp_nouveau_group_meta()->description ) ) : ?>
-                <div class="desc-wrap">
-                        <div class="group-description">
-                        <?php echo esc_html( bp_nouveau_group_meta()->description ); ?>
+<?php if ( ! bp_nouveau_groups_front_page_description() && bp_nouveau_group_has_meta( 'description' ) ) : ?>
+        <div class="desc-wrap">
+                <div class="group-description">
+                        <?php bp_group_description(); ?>
                 </div><!-- //.group_description -->
         </div>
-        <?php endif; ?>
 <?php endif; ?>

src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php

@@ -3 +3 @@
  * BP Nouveau Default group's front template.
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 3.2.0
  */
 ?>
 
@@ -30 +30 @@
                 <?php endif; ?>
         <?php endif; ?>
 
-        <?php if ( bp_nouveau_groups_front_page_description() ) : ?>
+        <?php if ( bp_nouveau_groups_front_page_description() && bp_nouveau_group_has_meta( 'description' ) ) : ?>
                 <div class="group-description">
 
                         <?php bp_group_description(); ?>

src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php

@@ -3 +3 @@
  * BuddyPress - Groups Header
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 ?>
 
@@ -46 +46 @@
         <?php endif; ?>
 
 
-                <?php if ( ! bp_nouveau_groups_front_page_description() ) { ?>
-                        <?php if ( bp_nouveau_group_meta()->description ) { ?>
-                                <div class="group-description">
-                                        <?php echo bp_nouveau_group_meta()->description; ?>
-                                </div><!-- //.group_description -->
-                        <?php   } ?>
-                <?php } ?>
+                <?php if ( ! bp_nouveau_groups_front_page_description() && bp_nouveau_group_has_meta( 'description' ) ) : ?>
+                        <div class="group-description">
+                                <?php bp_group_description(); ?>
+                        </div><!-- //.group_description -->
+                <?php endif; ?>
 
 </div><!-- #item-header-content -->
 

src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss

@@ -94 +94 @@
                         @include box-shadow(inset 0 0 9px $primary-grey);
                         padding: $pad-med;
                         text-align: left;
+
+                        p {
+                                margin: 0;
+                                padding: 0;
+                        }
                 }
         }
 } // close groups-header

src/bp-templates/bp-nouveau/css/buddypress.css

@@ -2293 +2293 @@
         text-align: left;
 }
 
+.groups-header .desc-wrap .group-description p {
+        margin: 0;
+        padding: 0;
+}
+
 /**
 *-----------------------------------------------------
 * @subsection 5.1.2 - Item Header User Accounts

src/bp-templates/bp-nouveau/includes/groups/template-tags.php

@@ -1048 +1048 @@
         }
 
 /**
- * Does the group has meta.
+ * Does the group has metas or a specific meta value.
  *
  * @since 3.0.0
+ * @since 3.2.0 Adds the $meta_key argument.
  *
- * @return bool True if the group has meta. False otherwise.
+ * @param  string $meta_key The key of the meta to check the value for.
+ * @return bool             True if the group has meta. False otherwise.
  */
-function bp_nouveau_group_has_meta() {
-        return (bool) bp_nouveau_get_group_meta();
+function bp_nouveau_group_has_meta( $meta_key = '' ) {
+        $group_meta = bp_nouveau_get_group_meta();
+
+        if ( ! $meta_key ) {
+                return (bool) $group_meta;
+        }
+
+        return ! empty( $group_meta[ $meta_key ] );
 }
 
 /**