<!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][5519] trunk/bp-groups/bp-groups-adminbar.php: Remove the Edit Page menu when viewing a group.</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/5519">5519</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-12-11 22:01:08 +0000 (Sun, 11 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the Edit Page menu when viewing a group. Remove the group name and avatar from Edit Group menu. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3838">#3838</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsadminbarphp">trunk/bp-groups/bp-groups-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-adminbar.php (5518 => 5519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-adminbar.php 2011-12-11 21:39:41 UTC (rev 5518)
+++ trunk/bp-groups/bp-groups-adminbar.php 2011-12-11 22:01:08 UTC (rev 5519)
</span><span class="lines">@@ -30,24 +30,13 @@
</span><span class="cx"> if ( !bp_current_user_can( 'bp_moderate' ) && !bp_group_is_admin() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Group avatar
- $avatar = bp_core_fetch_avatar( array(
- 'object' => 'group',
- 'type' => 'thumb',
- 'avatar_dir' => 'group-avatars',
- 'item_id' => $bp->groups->current_group->id,
- 'width' => 16,
- 'height' => 16,
- 'alt' => sprintf( __( 'Group logo of %s', 'buddypress' ), $bp->groups->current_group->name )
- ) );
</del><ins>+ // Unique ID for the 'Edit Group' menu
+ $bp->group_admin_menu_id = 'group-admin';
</ins><span class="cx">
</span><del>- // Unique ID for the 'My Account' menu
- $bp->group_admin_menu_id = ( ! empty( $avatar ) ) ? 'group-admin-with-avatar' : 'group-admin';
-
</del><span class="cx"> // Add the top-level Group Admin button
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'id' => $bp->group_admin_menu_id,
</span><del>- 'title' => $avatar . bp_get_current_group_name(),
</del><ins>+ 'title' => __( 'Edit Group', 'buddypress' ),
</ins><span class="cx"> 'href' => bp_get_group_permalink( $bp->groups->current_group )
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -115,4 +104,16 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_bar_menu', 'bp_groups_group_admin_menu', 99 );
</span><span class="cx">
</span><ins>+/**
+ * Remove rogue WP core edit menu when viewing a group
+ *
+ * @since BuddyPress (1.6)
+ */
+function bp_groups_remove_edit_page_menu() {
+ if ( bp_is_group() ) {
+ remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+ }
+}
+add_action( 'bp_init', 'bp_groups_remove_edit_page_menu', 99 );
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>