<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3519] trunk:
Links blog activity item thumbnails to the original post.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3519</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-12-05 18:59:53 +0000 (Sun, 05 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Links blog activity item thumbnails to the original post. Fixes #2337</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3518 => 3519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-12-05 18:29:48 UTC (rev 3518)
+++ trunk/bp-activity.php 2010-12-05 18:59:53 UTC (rev 3519)
</span><span class="lines">@@ -966,9 +966,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Activity
</span><span class="cx"> * @param $content str - The content to work with
</span><ins>+ * @param $link str - Optional. The URL that the image should link to
</ins><span class="cx"> * @return $content str - The content with images stripped and replaced with a single thumb.
</span><span class="cx"> */
</span><del>-function bp_activity_thumbnail_content_images( $content ) {
</del><ins>+function bp_activity_thumbnail_content_images( $content, $link = false ) {
+ global $post;
+
</ins><span class="cx"> preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
</span><span class="cx"> $content = preg_replace('/<img[^>]*>/Ui', '', $content );
</span><span class="cx">
</span><span class="lines">@@ -994,7 +997,13 @@
</span><span class="cx"> $new_height = (int)$height >= 100 ? 100 : $height;
</span><span class="cx"> $new_width = $new_height * $ratio;
</span><span class="cx">
</span><del>- $content = '<img src="' . esc_attr( $src) . '" width="' . $new_width . '" height="' . $new_height . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />' . $content;
</del><ins>+ $image = '<img src="' . esc_attr( $src ) . '" width="' . $new_width . '" height="' . $new_height . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />';
+
+ if ( !empty( $link ) ) {
+ $image = '<a href="' . $link . '">' . $image . '</a>';
+ }
+
+ $content = $image . $content;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3518 => 3519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-12-05 18:29:48 UTC (rev 3518)
+++ trunk/bp-blogs.php 2010-12-05 18:59:53 UTC (rev 3519)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> /* Remove large images and replace them with just one image thumbnail */
</span><span class="cx"> if ( function_exists( 'bp_activity_thumbnail_content_images' ) && !empty( $content ) )
</span><del>- $content = bp_activity_thumbnail_content_images( $content );
</del><ins>+ $content = bp_activity_thumbnail_content_images( $content, $primary_link );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $action ) )
</span><span class="cx"> $action = apply_filters( 'bp_blogs_record_activity_action', $action );
</span></span></pre>
</div>
</div>
</body>
</html>