<!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][7352] trunk: Replace mentions of 'blog' with 'site' throughout</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/7352">7352</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-08-23 20:55:12 +0000 (Fri, 23 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace mentions of 'blog' with 'site' throughout
This brings us into line with WP's terminology.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5006">#5006</a>
Props trishasalas</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsscreensphp">trunk/bp-blogs/bp-blogs-screens.php</a></li>
<li><a href="#trunkreadmetxt">trunk/readme.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (7351 => 7352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2013-08-19 18:28:25 UTC (rev 7351)
+++ trunk/bp-activity/bp-activity-admin.php 2013-08-23 20:55:12 UTC (rev 7352)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> 'title' => __( 'Item, Link, Type', 'buddypress' ),
</span><span class="cx"> 'content' =>
</span><span class="cx"> '<p>' . __( '<strong>Primary Item/Secondary Item</strong> - These identify the object that created the activity. For example, the fields could reference a comment left on a specific site. Some types of activity may only use one, or none, of these fields.', 'buddypress' ) . '</p>' .
</span><del>- '<p>' . __( '<strong>Link</strong> - Activity generated by blog posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item. Some types of activity may not use this field, even if it has been set.', 'buddypress' ) . '</p>' .
</del><ins>+ '<p>' . __( '<strong>Link</strong> - Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item. Some types of activity may not use this field, even if it has been set.', 'buddypress' ) . '</p>' .
</ins><span class="cx"> '<p>' . __( '<strong>Type</strong> - Each distinct kind of activity has its own type. For example, <code>created_group</code> is used when a group is created and <code>joined_group</code> is used when a user joins a group.', 'buddypress' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'For information about when and how BuddyPress uses all of these settings, see the Managing Activity link in the panel to the side.', 'buddypress' ) . '</p>'
</span><span class="cx"> ) );
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx">
</span><span class="cx"> <label class="screen-reader-text" for="bp-activities-link"><?php _e( 'Link', 'buddypress' ); ?></label>
</span><span class="cx"> <input type="url" name="bp-activities-link" value="<?php echo esc_url( $item->primary_link ); ?>" />
</span><del>- <p><?php _e( 'Activity generated by blog posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (7351 => 7352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2013-08-19 18:28:25 UTC (rev 7351)
+++ trunk/bp-activity/bp-activity-loader.php 2013-08-23 20:55:12 UTC (rev 7352)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * BuddyPress Activity Streams Loader
</span><span class="cx"> *
</span><del>- * An activity stream component, for users, groups, and blog tracking.
</del><ins>+ * An activity stream component, for users, groups, and site tracking.
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> * @subpackage ActivityCore
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (7351 => 7352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2013-08-19 18:28:25 UTC (rev 7351)
+++ trunk/bp-blogs/bp-blogs-loader.php 2013-08-23 20:55:12 UTC (rev 7352)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Blog/post/comment menus should not appear on single WordPress setups.
</del><ins>+ * Site/post/comment menus should not appear on single WordPress setups.
</ins><span class="cx"> * Although comments and posts made by users will still show on their
</span><span class="cx"> * activity stream.
</span><span class="cx"> */
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> $blogs_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
</span><span class="cx">
</span><del>- // Add the "Blogs" sub menu
</del><ins>+ // Add the "Sites" sub menu
</ins><span class="cx"> $wp_admin_nav[] = array(
</span><span class="cx"> 'parent' => $bp->my_account_menu_id,
</span><span class="cx"> 'id' => 'my-account-' . $this->id,
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> 'href' => trailingslashit( $blogs_link )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // My Blogs
</del><ins>+ // My Sites
</ins><span class="cx"> $wp_admin_nav[] = array(
</span><span class="cx"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx"> 'id' => 'my-account-' . $this->id . '-my-sites',
</span><span class="lines">@@ -172,12 +172,12 @@
</span><span class="cx"> 'href' => trailingslashit( $blogs_link )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Create a Blog
</del><ins>+ // Create a Site
</ins><span class="cx"> if ( bp_blog_signup_enabled() ) {
</span><span class="cx"> $wp_admin_nav[] = array(
</span><span class="cx"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx"> 'id' => 'my-account-' . $this->id . '-create',
</span><del>- 'title' => __( 'Create a Blog', 'buddypress' ),
</del><ins>+ 'title' => __( 'Create a Site', 'buddypress' ),
</ins><span class="cx"> 'href' => trailingslashit( bp_get_blogs_directory_permalink() . 'create' )
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> function setup_title() {
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><del>- // Set up the component options navigation for Blog
</del><ins>+ // Set up the component options navigation for Site
</ins><span class="cx"> if ( bp_is_blogs_component() ) {
</span><span class="cx"> if ( bp_is_my_profile() ) {
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span></span></pre></div>
<a id="trunkbpblogsbpblogsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-screens.php (7351 => 7352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-screens.php 2013-08-19 18:28:25 UTC (rev 7351)
+++ trunk/bp-blogs/bp-blogs-screens.php 2013-08-23 20:55:12 UTC (rev 7352)
</span><span class="lines">@@ -132,9 +132,9 @@
</span><span class="cx">
</span><span class="cx"> // Title based on ability to create blogs
</span><span class="cx"> if ( is_user_logged_in() && bp_blog_signup_enabled() ) {
</span><del>- $title = __( 'Blogs', 'buddypress' ) . ' <a class="button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create' ) . '">' . __( 'Create a Blog', 'buddypress' ) . '</a>';
</del><ins>+ $title = __( 'Sites', 'buddypress' ) . ' <a class="button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create' ) . '">' . __( 'Create a Sites', 'buddypress' ) . '</a>';
</ins><span class="cx"> } else {
</span><del>- $title = __( 'Blogs', 'buddypress' );
</del><ins>+ $title = __( 'Sites', 'buddypress' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bp_theme_compat_reset_post( array(
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx">
</span><span class="cx"> // Title based on ability to create blogs
</span><span class="cx"> if ( is_user_logged_in() && bp_blog_signup_enabled() ) {
</span><del>- $title = '<a class="button bp-title-button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '">' . __( 'Blogs', 'buddypress' ) . '</a> ' . __( 'Create a Blog', 'buddypress' );
</del><ins>+ $title = '<a class="button bp-title-button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '">' . __( 'Sites', 'buddypress' ) . '</a> ' . __( 'Create a Site', 'buddypress' );
</ins><span class="cx"> } else {
</span><del>- $title = __( 'Blogs', 'buddypress' );
</del><ins>+ $title = __( 'Sites', 'buddypress' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bp_theme_compat_reset_post( array(
</span></span></pre></div>
<a id="trunkreadmetxt"></a>
<div class="modfile"><h4>Modified: trunk/readme.txt (7351 => 7352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/readme.txt 2013-08-19 18:28:25 UTC (rev 7351)
+++ trunk/readme.txt 2013-08-23 20:55:12 UTC (rev 7352)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> = Will this work on WordPress multisite? =
</span><span class="cx">
</span><del>-Yes! If your WordPress installation has multisite enabled, BuddyPress will support the global tracking of blogs, posts and comments.
</del><ins>+Yes! If your WordPress installation has multisite enabled, BuddyPress will support the global tracking of sites, posts and comments.
</ins><span class="cx">
</span><span class="cx"> = Where can I get support? =
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> 4. **Extensible Groups** - Powerful public, private or hidden groups allow your users to break the discussion down into specific topics. Extend groups with your own custom features using the group extension API.
</span><span class="cx"> 5. **Friend Connections** - Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.
</span><span class="cx"> 6. **Private Messaging** - Private messaging will allow your users to talk to each other directly and in private. Not just limited to one-on-one discussions, your users can send messages to multiple recipients.
</span><del>-7. **Blogging Network** - Allow your users to start their own blogs using WordPress's Multisite feature, and track posts and comments from across your blog network in the activity stream.
</del><ins>+7. **Multisite Network** - Allow your users to start their own blogs using WordPress's Multisite feature, and track posts and comments from across your network in the activity stream.
</ins><span class="cx">
</span><span class="cx"> == Languages ==
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>