<!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] [2485] trunk: Improved noscript support.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2485</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-31 09:45:19 +0000 (Sun, 31 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved noscript support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatetagsphp">trunk/bp-messages/bp-messages-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityactivityloopphp">trunk/bp-themes/bp-default/activity/activity-loop.php</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityindexphp">trunk/bp-themes/bp-default/activity/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleactivityphp">trunk/bp-themes/bp-default/members/single/activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-activity/bp-activity-classes.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -144,8 +144,10 @@
</span><span class="cx"> $activities = BP_Activity_Activity::append_comments( &$activities );
</span><span class="cx">
</span><span class="cx"> /* If $max is set, only return up to the max results */
</span><del>- if ( (int)$total_activities > (int)$max )
- $total_activities = $max;
</del><ins>+ if ( !empty( $max ) ) {
+ if ( (int)$total_activities > (int)$max )
+ $total_activities = $max;
+ }
</ins><span class="cx">
</span><span class="cx"> return array( 'activities' => $activities, 'total' => (int)$total_activities );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -116,49 +116,94 @@
</span><span class="cx"> function bp_has_activities( $args = '' ) {
</span><span class="cx"> global $bp, $activities_template;
</span><span class="cx">
</span><ins>+ /***
+ * Set the defaults based on the current page. Any of these will be overridden
+ * if arguments are directly passed into the loop. Custom plugins should always
+ * pass their parameters directly to the loop.
+ */
+ $user_id = false;
+ $include = false;
+ $show_hidden = false;
+ $search_terms = false;
+ $object = false;
+ $primary_id = false;
+
+ /* User filtering */
+ if ( !empty( $bp->displayed_user->id ) )
+ $user_id = $bp->displayed_user->id;
+
+ /* User activity scope filtering */
+ if ( !empty( $user_id ) ) {
+ switch ( $bp->current_action ) {
+ case 'friends':
+ if ( function_exists( 'friends_get_friend_user_ids' ) )
+ $user_id = implode( ',', (array)friends_get_friend_user_ids( $bp->displayed_user->id ) );
+ break;
+ case 'groups':
+ if ( function_exists( 'groups_get_user_groups' ) ) {
+ $groups = groups_get_user_groups( $bp->displayed_user->id );
+ $object = $bp->groups->id;
+ $primary_id = implode( ',', (array)$groups['groups'] );
+ $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
+ }
+ break;
+ case 'favorites':
+ $favs = bp_activity_get_user_favorites( $bp->displayed_user->id );
+ $include = implode( ',', (array)$favs );
+ $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
+ break;
+ case 'mentions':
+ $search_terms = '@' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
+ $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
+ break;
+ }
+ }
+
+ /* Group filtering */
+ if ( !empty( $bp->groups->current_group ) ) {
+ $object = $bp->groups->id;
+ $primary_id = $bp->groups->current_group->id;
+ }
+
+ /* Support for permalinks on single item pages: /groups/my-group/activity/124/ */
+ if ( $bp->current_action == $bp->activity->slug )
+ $include = $bp->action_variables[0];
+
+ /* Support for basic filters in earlier BP versions. */
+ if ( isset( $_GET['afilter'] ) )
+ $filter = array( 'object' => $_GET['afilter'] );
+ else
+ $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
+
</ins><span class="cx"> /* Note: any params used for filtering can be a single value, or multiple values comma separated. */
</span><del>-
</del><span class="cx"> $defaults = array(
</span><del>- 'display_comments' => false, // false for none, stream/threaded - show comments in the stream or threaded under items
- 'include' => false, // pass an activity_id or string of ID's comma separated
</del><ins>+ 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
+ 'include' => $include, // pass an activity_id or string of ID's comma separated
</ins><span class="cx"> 'sort' => 'DESC', // sort DESC or ASC
</span><span class="cx"> 'page' => 1, // which page to load
</span><span class="cx"> 'per_page' => 25, // number of items per page
</span><span class="cx"> 'max' => false, // max number to return
</span><del>- 'show_hidden' => false, // Show activity items that are hidden site-wide?
</del><ins>+ 'show_hidden' => $show_hidden, // Show activity items that are hidden site-wide?
</ins><span class="cx">
</span><span class="cx"> /* Filtering */
</span><del>- 'user_id' => false, // user_id to filter on
- 'object' => false, // object to filter on e.g. groups, profile, status, friends
</del><ins>+ 'user_id' => $user_id, // user_id to filter on
+ 'object' => $object, // object to filter on e.g. groups, profile, status, friends
</ins><span class="cx"> 'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
</span><del>- 'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
</del><ins>+ 'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
</ins><span class="cx"> 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
</span><span class="cx">
</span><span class="cx"> /* Searching */
</span><del>- 'search_terms' => false // specify terms to search on
</del><ins>+ 'search_terms' => $search_terms // specify terms to search on
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- if ( ( 'personal' == $type || 'friends' == $type ) && !$user_id )
- $user_id = (int)$bp->displayed_user->id;
-
</del><span class="cx"> if ( $max ) {
</span><span class="cx"> if ( $per_page > $max )
</span><span class="cx"> $per_page = $max;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* Support for permalinks on single item pages: /groups/my-group/activity/124/ */
- if ( $bp->current_action == $bp->activity->slug )
- $include = $bp->action_variables[0];
-
- /* Support for basic filters in earlier BP versions. */
- if ( isset( $_GET['afilter'] ) )
- $filter = array( 'object' => $_GET['afilter'] );
- else
- $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
-
</del><span class="cx"> $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
</span><span class="lines">@@ -758,10 +803,18 @@
</span><span class="cx"> function bp_get_member_activity_feed_link() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
- return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed/' );
- else
- return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed/' );
</del><ins>+ if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
+ $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/';
+ else if ( 'friends' == $bp->current_action )
+ $link = $bp->displayed_user->domain . $bp->activity->slug . '/friends/feed/';
+ else if ( 'groups' == $bp->current_action )
+ $link = $bp->displayed_user->domain . $bp->activity->slug . '/groups/feed/';
+ else if ( 'favorites' == $bp->current_action )
+ $link = $bp->displayed_user->domain . $bp->activity->slug . '/favorites/feed/';
+ else if ( 'mentions' == $bp->current_action )
+ $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
+
+ return apply_filters( 'bp_get_activities_member_rss_link', $link );
</ins><span class="cx"> }
</span><span class="cx"> function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-activity.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -106,11 +106,14 @@
</span><span class="cx"> /* Add 'Activity' to the main navigation */
</span><span class="cx"> bp_core_new_nav_item( array( 'name' => __( 'Activity', 'buddypress' ), 'slug' => $bp->activity->slug, 'position' => 10, 'screen_function' => 'bp_activity_screen_my_activity', 'default_subnav_slug' => 'just-me', 'item_css_id' => $bp->activity->id ) );
</span><span class="cx">
</span><del>- $activity_link = $bp->loggedin_user->domain . $bp->activity->slug . '/';
</del><ins>+ $activity_link = $bp->displayed_user->domain . $bp->activity->slug . '/';
</ins><span class="cx">
</span><span class="cx"> /* Add the subnav items to the activity nav item if we are using a theme that supports this */
</span><del>- bp_core_new_subnav_item( array( 'name' => __( 'Just Me', 'buddypress' ), 'slug' => 'just-me', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_my_activity', 'position' => 10 ) );
- bp_core_new_subnav_item( array( 'name' => __( 'My Friends', 'buddypress' ), 'slug' => 'my-friends', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_friends_activity', 'position' => 20, 'item_css_id' => 'activity-my-friends' ) );
</del><ins>+ bp_core_new_subnav_item( array( 'name' => __( 'Personal', 'buddypress' ), 'slug' => 'just-me', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_my_activity', 'position' => 10 ) );
+ bp_core_new_subnav_item( array( 'name' => __( 'Friends', 'buddypress' ), 'slug' => 'friends', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_friends', 'position' => 20, 'item_css_id' => 'activity-friends' ) );
+ bp_core_new_subnav_item( array( 'name' => __( 'Groups', 'buddypress' ), 'slug' => 'groups', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_groups', 'position' => 30, 'item_css_id' => 'activity-groups' ) );
+ bp_core_new_subnav_item( array( 'name' => __( 'Favorites', 'buddypress' ), 'slug' => 'favorites', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_favorites', 'position' => 40, 'item_css_id' => 'activity-favs' ) );
+ bp_core_new_subnav_item( array( 'name' => sprintf( __( '@%s Mentions', 'buddypress' ), $bp->displayed_user->userdata->user_login ), 'slug' => 'mentions', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_mentions', 'position' => 50, 'item_css_id' => 'activity-mentions' ) );
</ins><span class="cx">
</span><span class="cx"> if ( $bp->current_component == $bp->activity->slug ) {
</span><span class="cx"> if ( bp_is_my_profile() ) {
</span><span class="lines">@@ -152,17 +155,52 @@
</span><span class="cx"> bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'members/single/home' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_screen_friends_activity() {
</del><ins>+function bp_activity_screen_friends() {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- /* Make sure delete links do not show for friends activity items */
</del><ins>+ if ( bp_is_deactivated( 'bp-friends.php' ) )
+ return false;
+
</ins><span class="cx"> if ( !is_site_admin() )
</span><span class="cx"> $bp->is_item_admin = false;
</span><span class="cx">
</span><del>- do_action( 'bp_activity_screen_friends_activity' );
- bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );
</del><ins>+ do_action( 'bp_activity_screen_friends' );
+ bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'members/single/home' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_activity_screen_groups() {
+ global $bp;
+
+ if ( bp_is_deactivated( 'bp-groups.php' ) )
+ return false;
+
+ if ( !is_site_admin() )
+ $bp->is_item_admin = false;
+
+ do_action( 'bp_activity_screen_groups' );
+ bp_core_load_template( apply_filters( 'bp_activity_template_groups_activity', 'members/single/home' ) );
+}
+
+function bp_activity_screen_favorites() {
+ global $bp;
+
+ if ( !is_site_admin() )
+ $bp->is_item_admin = false;
+
+ do_action( 'bp_activity_screen_favorites' );
+ bp_core_load_template( apply_filters( 'bp_activity_template_favorite_activity', 'members/single/home' ) );
+}
+
+function bp_activity_screen_mentions() {
+ global $bp;
+
+ if ( !is_site_admin() )
+ $bp->is_item_admin = false;
+
+ do_action( 'bp_activity_screen_mentions' );
+ bp_core_load_template( apply_filters( 'bp_activity_template_mention_activity', 'members/single/home' ) );
+}
+
</ins><span class="cx"> function bp_activity_screen_single_activity_permalink() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -344,7 +382,7 @@
</span><span class="cx"> function bp_activity_action_friends_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'my-friends' || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'friends' || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="lines">@@ -358,7 +396,7 @@
</span><span class="cx"> function bp_activity_action_my_groups_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'my-groups' || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'groups' || $bp->action_variables[0] != 'feed' )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -513,33 +513,23 @@
</span><span class="cx"> function bp_get_options_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- /***
- * Only render this navigation when the logged in user is looking at one of their own pages, or we are using it to display nav
- * menus for something like a group, or event.
- */
- if ( bp_is_my_profile() || $bp->is_single_item ) {
- if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
- return false;
</del><ins>+ if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
+ return false;
</ins><span class="cx">
</span><del>- /* Loop through each navigation item */
- foreach ( $bp->bp_options_nav[$bp->current_component] as $subnav_item ) {
- if ( !$subnav_item['user_has_access'] )
- continue;
</del><ins>+ /* Loop through each navigation item */
+ foreach ( $bp->bp_options_nav[$bp->current_component] as $subnav_item ) {
+ if ( !$subnav_item['user_has_access'] )
+ continue;
</ins><span class="cx">
</span><del>- /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
- if ( $subnav_item['slug'] == $bp->current_action ) {
- $selected = ' class="current selected"';
- } else {
- $selected = '';
- }
-
- /* echo out the final list item */
- echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . $subnav_item['css_id'] . '-personal-li" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
</del><ins>+ /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
+ if ( $subnav_item['slug'] == $bp->current_action ) {
+ $selected = ' class="current selected"';
+ } else {
+ $selected = '';
</ins><span class="cx"> }
</span><del>- } else {
- /* If we're using the classic template structure, show the displayed user nav instead */
- if ( 'bp-sn-parent' == basename( TEMPLATEPATH ) || defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
- bp_get_displayed_user_nav();
</del><ins>+
+ /* echo out the final list item */
+ echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . $subnav_item['css_id'] . '-personal-li" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-core.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -1476,7 +1476,6 @@
</span><span class="cx"> return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * bp_core_get_all_posts_for_user()
</span><span class="cx"> *
</span><span class="lines">@@ -1496,7 +1495,6 @@
</span><span class="cx"> return apply_filters( 'bp_core_get_all_posts_for_user', $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * bp_core_get_site_path()
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-messages/bp-messages-templatetags.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> $this->thread = $this->next_thread();
</span><span class="cx">
</span><span class="cx"> $last_message_index = count($this->thread->messages) - 1;
</span><del>- $this->thread->messages = array_reverse( $this->thread->messages );
</del><ins>+ $this->thread->messages = array_reverse( (array)$this->thread->messages );
</ins><span class="cx">
</span><span class="cx"> /* Set up the last message data */
</span><span class="cx"> if ( count($this->thread->messages) > 1 ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -182,13 +182,13 @@
</span><span class="cx"> case 'friends':
</span><span class="cx"> $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
</span><span class="cx"> $query_string = 'user_id=' . $friend_ids;
</span><del>- $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/my-friends/feed/';
</del><ins>+ $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/friends/feed/';
</ins><span class="cx"> break;
</span><span class="cx"> case 'groups':
</span><span class="cx"> $groups = groups_get_user_groups( $bp->loggedin_user->id );
</span><span class="cx"> $group_ids = implode( ',', $groups['groups'] );
</span><span class="cx"> $query_string = 'object=groups&primary_id=' . $group_ids . '&show_hidden=1';
</span><del>- $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/my-groups/feed/';
</del><ins>+ $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/groups/feed/';
</ins><span class="cx"> break;
</span><span class="cx"> case 'favorites':
</span><span class="cx"> $favs = bp_activity_get_user_favorites( $bp->loggedin_user->id );
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -579,7 +579,7 @@
</span><span class="cx"> height: 16px;
</span><span class="cx"> }
</span><span class="cx"> div.pagination#user-pag, .friends div.pagination,
</span><del>- .mygroups div.pagination, .myblogs div.pagination {
</del><ins>+ .mygroups div.pagination, .myblogs div.pagination, noscript div.pagination {
</ins><span class="cx"> background: #f8f8f8;
</span><span class="cx"> border: none;
</span><span class="cx"> padding: 8px 15px;
</span><span class="lines">@@ -953,6 +953,7 @@
</span><span class="cx"> }
</span><span class="cx"> #item-body form#whats-new-form {
</span><span class="cx"> margin-top: 20px;
</span><ins>+ border: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .home-page form#whats-new-form {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> j(this).removeClass('selected');
</span><span class="cx"> });
</span><span class="cx"> j('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
</span><del>- j('div.item-list-tabs li.selected').addClass('loading');
</del><ins>+ j('div#object-nav.item-list-tabs li.selected, div.activity-type-tabs li.selected').addClass('loading');
</ins><span class="cx"> j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
</span><span class="cx">
</span><span class="cx"> /* Reload the activity stream based on the selection */
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityactivityloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/activity-loop.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/activity-loop.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/activity/activity-loop.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -4,6 +4,14 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_has_activities( bp_ajax_querystring() ) ) : ?>
</span><span class="cx">
</span><ins>+ <?php /* Show pagination if JS is not enabled, since the "Load More" link will do nothing */ ?>
+ <noscript>
+ <div class="pagination">
+ <div class="pag-count"><?php bp_activity_pagination_count() ?></div>
+ <div class="pagination-links"><?php bp_activity_pagination_links() ?></div>
+ </div>
+ </noscript>
+
</ins><span class="cx"> <?php if ( empty( $_POST['page'] ) ) : ?>
</span><span class="cx"> <ul id="activity-stream" class="activity-list item-list">
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/index.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/index.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/activity/index.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -17,27 +17,27 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs activity-type-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( function_exists( 'bp_get_total_friend_count' ) ) : ?>
</span><span class="cx"> <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><del>- <li id="activity-friends"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#friends/' ) ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/friends/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( function_exists( 'bp_get_total_group_count_for_user' ) ) : ?>
</span><span class="cx"> <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><del>- <li id="activity-groups"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#groups/' ) ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/groups/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><del>- <li id="activity-favorites"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#favorites/' ) ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <li id="activity-atme"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#atme/' ) ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php printf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ) ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
</del><ins>+ <li id="activity-atme"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php printf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ) ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/functions.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -186,8 +186,6 @@
</span><span class="cx"> bp_core_remove_subnav_item( $bp->blogs->slug, 'my-blogs' );
</span><span class="cx"> bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-posts' );
</span><span class="cx"> bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-comments' );
</span><del>- bp_core_remove_subnav_item( $bp->activity->slug, 'just-me' );
- bp_core_remove_subnav_item( $bp->activity->slug, 'my-friends' );
</del><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'bp_dtheme_remove_redundant' );
</span><span class="cx">
</span><span class="lines">@@ -216,6 +214,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_footer', 'bp_dtheme_js_terms' );
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
</span><span class="cx"> if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" ) {
</span><span class="cx"> add_action( 'admin_notices', 'bp_dtheme_show_notice' );
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/activity.php (2484 => 2485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/activity.php 2010-01-30 16:53:52 UTC (rev 2484)
+++ trunk/bp-themes/bp-default/members/single/activity.php 2010-01-31 09:45:19 UTC (rev 2485)
</span><span class="lines">@@ -2,10 +2,6 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <?php bp_get_options_nav() ?>
</span><span class="cx">
</span><del>- <li class="feed"><a href="<?php bp_activities_member_rss_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
-
- <?php do_action( 'bp_member_activity_syndication_options' ) ?>
-
</del><span class="cx"> <li id="activity-filter-select" class="last">
</span><span class="cx"> <select>
</span><span class="cx"> <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
</span></span></pre>
</div>
</div>
</body>
</html>