<!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][12338] trunk/src: Improve character escaping in Messages AJAX.</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/12338">12338</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/12338","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-02-20 15:06:18 +0000 (Wed, 20 Feb 2019)</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'>Improve character escaping in Messages AJAX.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressassets_attachmentsavatarscropphp">trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressassets_attachmentsavatarscropphp">trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagesajaxphp">trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-avatars.php 2019-02-19 16:00:27 UTC (rev 12337)
+++ trunk/src/bp-core/bp-core-avatars.php 2019-02-20 15:06:18 UTC (rev 12338)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,7 +835,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle delete.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_core_delete_existing_avatar( array( 'item_id' => $avatar_data['item_id'], 'object' => $avatar_data['object'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => html_entity_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object' => $avatar_data['object'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $avatar_data['item_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1273,7 +1273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => html_entity_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object' => $avatar_data['object'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $avatar_data['item_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1330,7 +1330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle crop.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_core_avatar_handle_crop( $r ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => html_entity_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object' => $avatar_data['object'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $avatar_data['item_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => false,
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressassets_attachmentsavatarscropphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php 2019-02-19 16:00:27 UTC (rev 12337)
+++ trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/crop.php 2019-02-20 15:06:18 UTC (rev 12338)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,11 +14,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-bp-avatar-item" type="text/html">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-to-crop">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="{{data.url}}"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img src="{{{data.url}}}"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="avatar-crop-management">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-crop-pane" class="avatar" style="width:{{data.full_w}}px; height:{{data.full_h}}px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="{{data.url}}" id="avatar-crop-preview"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img src="{{{data.url}}}" id="avatar-crop-preview"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-crop-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button avatar-crop-submit" href="#"><?php esc_html_e( 'Crop Image', 'buddypress' ); ?></a>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressassets_attachmentsavatarscropphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php 2019-02-19 16:00:27 UTC (rev 12337)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/crop.php 2019-02-20 15:06:18 UTC (rev 12338)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,11 +11,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-bp-avatar-item" type="text/html">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-to-crop">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="{{data.url}}"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img src="{{{data.url}}}"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="avatar-crop-management">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-crop-pane" class="avatar" style="width:{{data.full_w}}px; height:{{data.full_h}}px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="{{data.url}}" id="avatar-crop-preview"/>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img src="{{{data.url}}}" id="avatar-crop-preview"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="avatar-crop-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button avatar-crop-submit"><?php echo esc_html_x( 'Crop Image', 'button', 'buddypress' ); ?></button>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmessagesajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2019-02-19 16:00:27 UTC (rev 12337)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php 2019-02-20 15:06:18 UTC (rev 12338)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,11 +162,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Output single message template part.
</span><span class="cx" style="display: block; padding: 0 10px"> $reply = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bp_get_the_thread_message_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => html_entity_decode( do_shortcode( bp_get_the_thread_message_content() ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => do_shortcode( bp_get_the_thread_message_content() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sender_id' => bp_get_the_thread_message_sender_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_name' => esc_html( bp_get_the_thread_message_sender_name() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_link' => bp_get_the_thread_message_sender_link(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sender_avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sender_avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => bp_get_the_thread_message_sender_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'thumb',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,13 +269,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $threads->threads[ $i ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bp_get_message_thread_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'message_id' => (int) $last_message_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subject' => html_entity_decode( bp_get_message_thread_subject() ),
- 'excerpt' => html_entity_decode( bp_get_message_thread_excerpt() ),
- 'content' => html_entity_decode( do_shortcode( bp_get_message_thread_content() ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subject' => strip_tags( bp_get_message_thread_subject() ),
+ 'excerpt' => strip_tags( bp_get_message_thread_excerpt() ),
+ 'content' => do_shortcode( bp_get_message_thread_content() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unread' => bp_message_thread_has_unread(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_name' => bp_core_get_user_displayname( $messages_template->thread->last_sender_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_link' => bp_core_get_userlink( $messages_template->thread->last_sender_id, false, true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sender_avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sender_avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $messages_template->thread->last_sender_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'thumb',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $messages_template->thread->recipients ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $messages_template->thread->recipients as $recipient ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $threads->threads[ $i ]['recipients'][] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $recipient->user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'thumb',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,13 +429,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['js_thread'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thread->thread = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bp_get_the_thread_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'subject' => html_entity_decode( bp_get_the_thread_subject() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subject' => strip_tags( bp_get_the_thread_subject() ),
</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"> if ( is_array( $thread_template->thread->recipients ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $thread_template->thread->recipients as $recipient ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thread->thread['recipients'][] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $recipient->user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'thumb',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,11 +456,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ( bp_thread_messages() ) : bp_thread_the_message();
</span><span class="cx" style="display: block; padding: 0 10px"> $thread->messages[ $i ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => bp_get_the_thread_message_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => html_entity_decode( do_shortcode( bp_get_the_thread_message_content() ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => do_shortcode( bp_get_the_thread_message_content() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sender_id' => bp_get_the_thread_message_sender_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_name' => esc_html( bp_get_the_thread_message_sender_name() ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'sender_link' => bp_get_the_thread_message_sender_link(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sender_avatar' => htmlspecialchars_decode( bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sender_avatar' => esc_url( bp_core_fetch_avatar( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => bp_get_the_thread_message_sender_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'thumb',
</span></span></pre>
</div>
</div>
</body>
</html>