Changeset 12214

Timestamp:

09/05/2018 01:52:54 AM (8 years ago)

Author:

imath

Message:

BP Nouveau: Avoid escaping single Group description after sanitization

Props MorgunovVit dcavins marcella1981

See #7923 (branch 3.0)

Location:

branches/3.0/src/bp-templates/bp-nouveau

Files:

• buddypress/groups/single/cover-image-header.php (modified) (2 diffs)
• buddypress/groups/single/default-front.php (modified) (2 diffs)
• buddypress/groups/single/group-header.php (modified) (2 diffs)
• common-styles/_bp_group_header.scss (modified) (1 diff)
• css/buddypress-rtl.css (modified) (1 diff)
• css/buddypress.css (modified) (1 diff)
• includes/groups/template-tags.php (modified) (2 diffs)

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 ?>
@@ -56 +56 @@
 </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; ?>

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 3.2.0
  */
 ?>
@@ -31 +31 @@
         <?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">
 

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.1.0
+ * @version 3.2.0
  */
 ?>
@@ -47 +47 @@
 
 
-                <?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 -->

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

@@ -95 +95 @@
                         padding: $pad-med;
                         text-align: left;
+
+                        p {
+                                margin: 0;
+                                padding: 0;
+                        }
                 }
         }

branches/3.0/src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -2337 +2337 @@
         padding: 1em;
         text-align: right;
+}
+
+.groups-header .desc-wrap .group-description p {
+        margin: 0;
+        padding: 0;
 }
 

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

@@ -2337 +2337 @@
         padding: 1em;
         text-align: left;
+}
+
+.groups-header .desc-wrap .group-description p {
+        margin: 0;
+        padding: 0;
 }
 

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

@@ -4 +4 @@
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 3.2.0
  */
 
@@ -1049 +1049 @@
 
 /**
- * Does the group has meta.
- *
- * @since 3.0.0
- *
- * @return bool True if the group has meta. False otherwise.
- */
-function bp_nouveau_group_has_meta() {
-        return (bool) bp_nouveau_get_group_meta();
+ * Does the group has metas or a specific meta value.
+ *
+ * @since 3.0.0
+ * @since 3.2.0 Adds the $meta_key argument.
+ *
+ * @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( $meta_key = '' ) {
+        $group_meta = bp_nouveau_get_group_meta();
+
+        if ( ! $meta_key ) {
+                return (bool) $group_meta;
+        }
+
+        return ! empty( $group_meta[ $meta_key ] );
 }