Changeset 3337
- Timestamp:
- 11/02/2010 03:01:31 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity.php
r3300 r3337 428 428 global $bp, $wp_query; 429 429 430 if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'friends'|| $bp->action_variables[0] != 'feed' )430 if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != $bp->friends->slug || $bp->action_variables[0] != 'feed' ) 431 431 return false; 432 432 … … 442 442 global $bp, $wp_query; 443 443 444 if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'groups'|| $bp->action_variables[0] != 'feed' )444 if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != $bp->groups->slug || $bp->action_variables[0] != 'feed' ) 445 445 return false; 446 446 -
trunk/bp-activity/bp-activity-templatetags.php
r3318 r3337 992 992 echo bp_get_member_activity_feed_link(); 993 993 } 994 function bp_activities_member_rss_link() { echo bp_get_member_activity_feed_link(); } 994 function bp_activities_member_rss_link() { 995 echo bp_get_member_activity_feed_link(); 996 } 995 997 996 998 function bp_get_member_activity_feed_link() { … … 999 1001 if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action ) 1000 1002 $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/'; 1001 else if ( 'friends'== $bp->current_action )1002 $link = $bp->displayed_user->domain . $bp->activity->slug . '/ friends/feed/';1003 else if ( 'groups'== $bp->current_action )1004 $link = $bp->displayed_user->domain . $bp->activity->slug . '/ groups/feed/';1003 else if ( $bp->friends->slug == $bp->current_action ) 1004 $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->friends->slug . '/feed/'; 1005 else if ( $bp->groups->slug == $bp->current_action ) 1006 $link = $bp->displayed_user->domain . $bp->activity->slug . '/' . $bp->groups->slug . '/feed/'; 1005 1007 else if ( 'favorites' == $bp->current_action ) 1006 1008 $link = $bp->displayed_user->domain . $bp->activity->slug . '/favorites/feed/'; -
trunk/bp-blogs.php
r3332 r3337 53 53 54 54 /* Set up the component options navigation for Blog */ 55 if ( 'blogs'== $bp->current_component ) {55 if ( $bp->blogs->slug == $bp->current_component ) { 56 56 if ( bp_is_my_profile() ) { 57 57 if ( function_exists('xprofile_setup_nav') ) { -
trunk/bp-core/bp-core-templatetags.php
r3329 r3337 1614 1614 global $bp; 1615 1615 1616 if ( $bp->activity-> name== $bp->current_component )1616 if ( $bp->activity->slug == $bp->current_component ) 1617 1617 return true; 1618 1618 … … 1623 1623 global $bp; 1624 1624 1625 if ( $bp->activity-> name== $bp->current_component && 'my-friends' == $bp->current_action )1625 if ( $bp->activity->slug == $bp->current_component && 'my-friends' == $bp->current_action ) 1626 1626 return true; 1627 1627 … … 1668 1668 global $bp; 1669 1669 1670 if ( $bp->groups-> name== $bp->current_component )1670 if ( $bp->groups->slug == $bp->current_component ) 1671 1671 return true; 1672 1672 … … 1795 1795 global $bp; 1796 1796 1797 if ( $bp->blogs-> name== $bp->current_component )1797 if ( $bp->blogs->slug == $bp->current_component ) 1798 1798 return true; 1799 1799 … … 1804 1804 global $bp; 1805 1805 1806 if ( $bp->blogs-> name== $bp->current_component && 'recent-posts' == $bp->current_action )1806 if ( $bp->blogs->slug == $bp->current_component && 'recent-posts' == $bp->current_action ) 1807 1807 return true; 1808 1808 … … 1813 1813 global $bp; 1814 1814 1815 if ( $bp->blogs-> name== $bp->current_component && 'recent-comments' == $bp->current_action )1815 if ( $bp->blogs->slug == $bp->current_component && 'recent-comments' == $bp->current_action ) 1816 1816 return true; 1817 1817
Note: See TracChangeset
for help on using the changeset viewer.