<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12214] branches/3.0/src/bp-templates/bp-nouveau: BP Nouveau: Avoid escaping single Group description after sanitization</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12214">12214</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12214","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-09-05 01:52:54 +0000 (Wed, 05 Sep 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP Nouveau: Avoid escaping single Group description after sanitization
Props MorgunovVit dcavins marcella1981
See <a href="http://buddypress.trac.wordpress.org/ticket/7923">#7923</a> (branch 3.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30srcbptemplatesbpnouveaubuddypressgroupssinglecoverimageheaderphp">branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaubuddypressgroupssingledefaultfrontphp">branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaubuddypressgroupssinglegroupheaderphp">branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaucommonstyles_bp_group_headerscss">branches/3.0/src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaucssbuddypressrtlcss">branches/3.0/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</a></li>
<li><a href="#branches30srcbptemplatesbpnouveaucssbuddypresscss">branches/3.0/src/bp-templates/bp-nouveau/css/buddypress.css</a></li>
<li><a href="#branches30srcbptemplatesbpnouveauincludesgroupstemplatetagsphp">branches/3.0/src/bp-templates/bp-nouveau/includes/groups/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30srcbptemplatesbpnouveaubuddypressgroupssinglecoverimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * BuddyPress - Groups Cover Image Header.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 3.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,12 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #cover-image-container -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?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 ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?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(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- //.group_description -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaubuddypressgroupssingledefaultfrontphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/default-front.php 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * BP Nouveau Default group's front template.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 3.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bp_nouveau_groups_front_page_description() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bp_nouveau_groups_front_page_description() && bp_nouveau_group_has_meta( 'description' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="group-description">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_group_description(); ?>
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaubuddypressgroupssinglegroupheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * BuddyPress - Groups Header
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 3.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,13 +46,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?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 } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #item-header-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaucommonstyles_bp_group_headerscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,6 +94,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> @include box-shadow(inset 0 0 9px $primary-grey);
</span><span class="cx" style="display: block; padding: 0 10px"> padding: $pad-med;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: left;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ p {
+ margin: 0;
+ padding: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // close groups-header
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaucssbuddypressrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2338,6 +2338,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: right;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.groups-header .desc-wrap .group-description p {
+ margin: 0;
+ padding: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> *-----------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> * @subsection 5.1.2 - Item Header User Accounts
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveaucssbuddypresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/css/buddypress.css 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/css/buddypress.css 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2338,6 +2338,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: left;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.groups-header .desc-wrap .group-description p {
+ margin: 0;
+ padding: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> *-----------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> * @subsection 5.1.2 - Item Header User Accounts
</span></span></pre></div>
<a id="branches30srcbptemplatesbpnouveauincludesgroupstemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.0/src/bp-templates/bp-nouveau/includes/groups/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.0/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2018-09-04 03:44:49 UTC (rev 12213)
+++ branches/3.0/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2018-09-05 01:52:54 UTC (rev 12214)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Groups Template tags
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 3.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,14 +1048,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Does the group has meta.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Does the group has metas or a specific meta value.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 3.2.0 Adds the $meta_key argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True if the group has meta. False otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $meta_key The key of the meta to check the value for.
+ * @return bool True if the group has meta. False otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_nouveau_group_has_meta() {
- return (bool) bp_nouveau_get_group_meta();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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 ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>