<!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][5903] trunk/bp-groups: Improvements to link construction and filters in the Groups component:</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><a href="http://buddypress.trac.wordpress.org/changeset/5903">5903</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-03-11 15:54:27 +0000 (Sun, 11 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improvements to link construction and filters in the Groups component:
- Fixes arguments being passed to bp_groups_get_total_groups_sql filter
- Passes additional arguments to various group link filters
- Sweeps through link concatenation in the groups component, to ensure that bp_get_group_permalink is used wherever possible (allowing for centralized filters in plugins)
- Corrects some inline documentation
- Fixes the permissions logic in bp_groups_adminbar_admin_menu(), so that super admins and group admins are able to see the group-specific dropdown when using the BuddyBar
- Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4071">#4071</a>. Props travel-junkie</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsbuddybarphp">trunk/bp-groups/bp-groups-buddybar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsbuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-buddybar.php (5902 => 5903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-buddybar.php 2012-03-11 15:36:07 UTC (rev 5902)
+++ trunk/bp-groups/bp-groups-buddybar.php 2012-03-11 15:54:27 UTC (rev 5903)
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> if ( empty( $bp->groups->current_group ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Don't show this menu to non site admins or if you're viewing your own profile
- if ( !current_user_can( 'edit_users' ) || !bp_current_user_can( 'bp_moderate' ) || ( bp_is_item_admin() && ! bp_is_item_mod() ) )
</del><ins>+ // Only group admins and site admins can see this menu
+ if ( !current_user_can( 'edit_users' ) && !bp_current_user_can( 'bp_moderate' ) && !bp_is_item_admin() )
</ins><span class="cx"> return false; ?>
</span><span class="cx">
</span><span class="cx"> <li id="bp-adminbar-adminoptions-menu">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (5902 => 5903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2012-03-11 15:36:07 UTC (rev 5902)
+++ trunk/bp-groups/bp-groups-classes.php 2012-03-11 15:54:27 UTC (rev 5903)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> $t_sql .= " WHERE " . join( ' AND ', (array) $total_sql['where'] );
</span><span class="cx">
</span><span class="cx"> // Get total group results
</span><del>- $total_groups_sql = apply_filters( 'bp_groups_get_total_groups_sql', join( ' ', (array) $t_sql ), $t_sql );
</del><ins>+ $total_groups_sql = apply_filters( 'bp_groups_get_total_groups_sql', $t_sql, $total_sql );
</ins><span class="cx"> $total_groups = $wpdb->get_var( $total_groups_sql );
</span><span class="cx">
</span><span class="cx"> $group_ids = array();
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5902 => 5903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2012-03-11 15:36:07 UTC (rev 5902)
+++ trunk/bp-groups/bp-groups-loader.php 2012-03-11 15:54:27 UTC (rev 5903)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $group_link = trailingslashit( bp_get_root_domain() . '/' . $this->root_slug . '/' . $this->current_group->slug );
</del><ins>+ $group_link = bp_get_group_permalink( $this->current_group );
</ins><span class="cx">
</span><span class="cx"> // Add the "Home" subnav item, as this will always be present
</span><span class="cx"> $sub_nav[] = array(
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5902 => 5903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2012-03-11 15:36:07 UTC (rev 5902)
+++ trunk/bp-groups/bp-groups-template.php 2012-03-11 15:54:27 UTC (rev 5903)
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> if ( empty( $group ) )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_permalink', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/' );
</del><ins>+ return apply_filters( 'bp_get_group_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_admin_permalink() {
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> if ( empty( $group ) )
</span><span class="cx"> $group =& $groups_template->group;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_group_admin_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin' ) );
</del><ins>+ return apply_filters( 'bp_get_group_admin_permalink', trailingslashit( bp_get_group_permalink( $group ) . '/admin' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_slug() {
</span><span class="lines">@@ -1266,32 +1266,32 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_item_admin() || bp_is_item_mod() ) : ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/edit-details' ) ?>"><?php _e( 'Details', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/edit-details' ) ?>"><?php _e( 'Details', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( ! bp_is_item_admin() )
</span><span class="cx"> return false; ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/manage-members' ) ?>"><?php _e( 'Members', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/manage-members' ) ?>"><?php _e( 'Members', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( $groups_template->group->status == 'private' ) : ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/membership-requests' ) ?>"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/membership-requests' ) ?>"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'groups_admin_tabs', $current_tab, $group->slug ) ?>
</span><span class="cx">
</span><del>- <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/delete-group' ) ?>"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
</del><ins>+ <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/delete-group' ) ?>"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -1663,7 +1663,7 @@
</span><span class="cx"> echo bp_get_total_group_count_for_user( $user_id );
</span><span class="cx"> }
</span><span class="cx"> function bp_get_total_group_count_for_user( $user_id = 0 ) {
</span><del>- return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ) );
</del><ins>+ return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ), $user_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2828,15 +2828,15 @@
</span><span class="cx"> function bp_get_groups_action_link( $action = '', $query_args = '', $nonce = false ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- // Must be displayed user
</del><ins>+ // Must be a group
</ins><span class="cx"> if ( empty( $bp->groups->current_group->id ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Append $action to $url if there is no $type
</del><ins>+ // Append $action to $url if provided
</ins><span class="cx"> if ( !empty( $action ) )
</span><del>- $url = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $bp->groups->current_group->slug . '/' . $action;
</del><ins>+ $url = bp_get_group_permalink( groups_get_current_group() ) . $action;
</ins><span class="cx"> else
</span><del>- $url = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $bp->groups->current_group->slug;
</del><ins>+ $url = bp_get_group_permalink( groups_get_current_group() );
</ins><span class="cx">
</span><span class="cx"> // Add a slash at the end of our user url
</span><span class="cx"> $url = trailingslashit( $url );
</span></span></pre>
</div>
</div>
</body>
</html>