<!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][3671] trunk/bp-blogs.php: Adds argument swapping to blog activity stream strings.</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, #logmsg > ol { margin-left: 0; 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>3671</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-01-08 16:57:52 +0000 (Sat, 08 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds argument swapping to blog activity stream strings. Fixes #2028. Props sorich87</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3670 => 3671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2011-01-08 16:51:59 UTC (rev 3670)
+++ trunk/bp-blogs.php 2011-01-08 16:57:52 UTC (rev 3671)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> // Register this in the active components array
</span><span class="cx"> $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
</span><span class="cx">
</span><del>- // The default text for the blogs directory search box
- $bp->default_search_strings[$bp->blogs->slug] = __( 'Search Blogs...', 'buddypress' );
</del><ins>+ // The default text for the blogs directory search box
+ $bp->default_search_strings[$bp->blogs->slug] = __( 'Search Blogs...', 'buddypress' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_setup_globals' );
</span><span class="cx"> }
</span><span class="lines">@@ -291,13 +291,13 @@
</span><span class="cx"> $recorded_blog->blog_id = $blog_id;
</span><span class="cx">
</span><span class="cx"> $recorded_blog_id = $recorded_blog->save();
</span><del>-
- $is_recorded = !empty( $recorded_blog_id ) ? true : false;
</del><span class="cx">
</span><ins>+ $is_recorded = !empty( $recorded_blog_id ) ? true : false;
+
</ins><span class="cx"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
</span><span class="cx"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
</span><span class="cx"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', bp_core_current_time() );
</span><del>-
</del><ins>+
</ins><span class="cx"> $is_private = !empty( $_POST['blog_public'] ) && (int)$_POST['blog_public'] ? false : true;
</span><span class="cx">
</span><span class="cx"> // Only record this activity if the blog is public
</span><span class="lines">@@ -367,11 +367,11 @@
</span><span class="cx"> if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</span><span class="cx"> // Record this in activity streams
</span><span class="cx"> $post_permalink = get_permalink( $post_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() ) {
</span><del>- $activity_action = sprintf( __( '%s wrote a new blog post: %s on the blog %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
</del><ins>+ $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s on the blog %3$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
</ins><span class="cx"> } else {
</span><del>- $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
</del><ins>+ $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $activity_content = $post->post_content;
</span><span class="lines">@@ -449,13 +449,13 @@
</span><span class="cx">
</span><span class="cx"> // Prepare to record in activity streams
</span><span class="cx"> if ( is_multisite() ) {
</span><del>- $activity_action = sprintf( __( '%s commented on the blog post %s on the blog %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
</del><ins>+ $activity_action = sprintf( __( '%1$s commented on the blog post %2$s on the blog %3$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
</ins><span class="cx"> } else {
</span><del>- $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
</del><ins>+ $activity_action = sprintf( __( '%1$s commented on the blog post %2$s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . apply_filters( 'the_title', $recorded_comment->post->post_title ) . '</a>' );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $activity_content = $recorded_comment->comment_content;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Record in activity streams
</span><span class="cx"> bp_blogs_record_activity( array(
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="lines">@@ -493,9 +493,9 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $role ) ) {
</span><span class="cx"> $key = $wpdb->get_blog_prefix( $blog_id ). 'capabilities';
</span><del>-
</del><ins>+
</ins><span class="cx"> $roles = get_user_meta( $user_id, $key, true );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_array( $roles ) )
</span><span class="cx"> $role = array_search( 1, $roles );
</span><span class="cx"> else
</span><span class="lines">@@ -785,4 +785,4 @@
</span><span class="cx"> add_action( 'bp_blogs_new_blog', 'bp_core_clear_cache' );
</span><span class="cx"> add_action( 'bp_blogs_remove_data', 'bp_core_clear_cache' );
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>