<!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][7349] trunk: Use esc_url() where esc_attr() was incorrectly used in activity/blogs/groups components.</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7349">7349</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-08-12 22:53:30 +0000 (Mon, 12 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use esc_url() where esc_attr() was incorrectly used in activity/blogs/groups components. Also escape $link when it's fed into bp_activity_thumbnail_content_images() directly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (7348 => 7349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2013-08-12 22:41:46 UTC (rev 7348)
+++ trunk/bp-activity/bp-activity-functions.php 2013-08-12 22:53:30 UTC (rev 7349)
</span><span class="lines">@@ -1524,7 +1524,7 @@
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> *
</span><span class="cx"> * @param string $content The content to work with
</span><del>- * @param string $link Optional. The URL that the image should link to
</del><ins>+ * @param string $link Optional. The unescaped URL that the image should link to
</ins><span class="cx"> * @param array $activity_args Optional. The args passed to the activity
</span><span class="cx"> * creation function (eg bp_blogs_record_activity())
</span><span class="cx"> *
</span><span class="lines">@@ -1561,11 +1561,10 @@
</span><span class="cx"> $ratio = (int) $width / (int) $height;
</span><span class="cx"> $new_height = (int) $height >= 100 ? 100 : $height;
</span><span class="cx"> $new_width = $new_height * $ratio;
</span><ins>+ $image = '<img src="' . esc_url( $src ) . '" width="' . absint( $new_width ) . '" height="' . absint( $new_height ) . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />';
</ins><span class="cx">
</span><del>- $image = '<img src="' . esc_attr( $src ) . '" width="' . $new_width . '" height="' . $new_height . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />';
-
</del><span class="cx"> if ( !empty( $link ) ) {
</span><del>- $image = '<a href="' . $link . '">' . $image . '</a>';
</del><ins>+ $image = '<a href="' . esc_url( $link ) . '">' . $image . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $content = $image . $content;
</span></span></pre></div>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (7348 => 7349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2013-08-12 22:41:46 UTC (rev 7348)
+++ trunk/bp-blogs/bp-blogs-functions.php 2013-08-12 22:53:30 UTC (rev 7349)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> // Get activity related links
</span><span class="cx"> $post_permalink = get_permalink( $recorded_comment->comment_post_ID );
</span><del>- $comment_link = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
</del><ins>+ $comment_link = get_comment_link( $recorded_comment->comment_ID );
</ins><span class="cx">
</span><span class="cx"> // Prepare to record in activity streams
</span><span class="cx"> if ( is_multisite() )
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (7348 => 7349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2013-08-12 22:41:46 UTC (rev 7348)
+++ trunk/bp-groups/bp-groups-template.php 2013-08-12 22:53:30 UTC (rev 7349)
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx">
</span><span class="cx"> /* Fetch the avatar from the folder, if not provide backwards compat. */
</span><span class="cx"> if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $alt ) ) )
</span><del>- $avatar = '<img src="' . esc_attr( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';
</del><ins>+ $avatar = '<img src="' . esc_url( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_group_avatar', $avatar );
</span><span class="cx"> }
</span><span class="lines">@@ -2604,11 +2604,11 @@
</span><span class="cx">
</span><span class="cx"> if ( $bp->groups->current_group->avatar_full ) { ?>
</span><span class="cx">
</span><del>- <img src="<?php echo esc_attr( $bp->groups->current_group->avatar_full ) ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
</del><ins>+ <img src="<?php echo esc_url( $bp->groups->current_group->avatar_full ); ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
</ins><span class="cx">
</span><span class="cx"> <?php } else { ?>
</span><span class="cx">
</span><del>- <img src="<?php echo $bp->groups->image_base . '/none.gif' ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
</del><ins>+ <img src="<?php echo esc_url( $bp->groups->image_base . '/none.gif' ); ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
</ins><span class="cx">
</span><span class="cx"> <?php }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>