<!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][6830] trunk/bp-groups/bp-groups-admin.php: s/activity/group throughout bp-groups-admin.php</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/6830">6830</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-03-03 19:42:21 +0000 (Sun, 03 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/activity/group throughout bp-groups-admin.php
See <a href="http://buddypress.trac.wordpress.org/ticket/4861">#4861</a>
Props imath</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsadminphp">trunk/bp-groups/bp-groups-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-admin.php (6829 => 6830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-admin.php 2013-03-02 00:00:16 UTC (rev 6829)
+++ trunk/bp-groups/bp-groups-admin.php 2013-03-03 19:42:21 UTC (rev 6830)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> // Index screen
</span><span class="cx"> } else {
</span><del>- // Create the Activity screen list table
</del><ins>+ // Create the Groups screen list table
</ins><span class="cx"> $bp_groups_list_table = new BP_Groups_List_Table();
</span><span class="cx">
</span><span class="cx"> // per_page screen option
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( $doaction && 'save' == $doaction ) {
</span><del>- // Get activity ID
</del><ins>+ // Get group ID
</ins><span class="cx"> $group_id = isset( $_REQUEST['gid'] ) ? (int) $_REQUEST['gid'] : '';
</span><span class="cx">
</span><span class="cx"> $redirect_to = add_query_arg( array(
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx"> $is_error = ! empty( $no_admins ) || ! empty( $errors ) || ! empty( $error_new ) || ! empty( $error_modified );
</span><span class="cx">
</span><del>- // Get the activity from the database
</del><ins>+ // Get the group from the database
</ins><span class="cx"> $group = groups_get_group( 'group_id=' . $_GET['gid'] );
</span><span class="cx"> $group_name = isset( $group->name ) ? apply_filters( 'bp_get_group_name', $group->name ) : '';
</span><span class="cx">
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> * Display the Groups admin index screen, which contains a list of all your
</span><span class="cx"> * BuddyPress groups.
</span><span class="cx"> *
</span><del>- * @global BP_Activity_List_Table $bp_groups_list_table Activity screen list table
</del><ins>+ * @global BP_Group_List_Table $bp_groups_list_table Group screen list table
</ins><span class="cx"> * @global string $plugin_page
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="lines">@@ -613,11 +613,11 @@
</span><span class="cx"> $deleted = ! empty( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
</span><span class="cx">
</span><span class="cx"> if ( $deleted > 0 ) {
</span><del>- $messages[] = sprintf( _n( '%s activity has been permanently deleted.', '%s activity items have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
</del><ins>+ $messages[] = sprintf( _n( '%s group has been permanently deleted.', '%s groups have been permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Prepare the activity items for display
</del><ins>+ // Prepare the group items for display
</ins><span class="cx"> $bp_groups_list_table->prepare_items();
</span><span class="cx">
</span><span class="cx"> // Call an action for plugins to modify the messages before we display the edit form
</span><span class="lines">@@ -950,8 +950,8 @@
</span><span class="cx"> // Define singular and plural labels, as well as whether we support AJAX.
</span><span class="cx"> parent::__construct( array(
</span><span class="cx"> 'ajax' => false,
</span><del>- 'plural' => 'activities',
- 'singular' => 'activity',
</del><ins>+ 'plural' => 'groups',
+ 'singular' => 'group',
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> $this->group_counts[ $group_type ] = count( $group_ids );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If we're viewing a specific activity, flatten all activites into a single array.
</del><ins>+ // If we're viewing a specific group, flatten all activites into a single array.
</ins><span class="cx"> if ( $include_id ) {
</span><span class="cx"> $groups = array( (array) groups_get_group( 'group_id=' . $include_id ) );
</span><span class="cx"> } else {
</span><span class="lines">@@ -1129,7 +1129,7 @@
</span><span class="cx"> $row_class = ' class="even"';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- echo '<tr' . $row_class . ' id="activity-' . esc_attr( $item['id'] ) . '" data-parent_id="' . esc_attr( $item['id'] ) . '" data-root_id="' . esc_attr( $item['id'] ) . '">';
</del><ins>+ echo '<tr' . $row_class . ' id="group-' . esc_attr( $item['id'] ) . '" data-parent_id="' . esc_attr( $item['id'] ) . '" data-root_id="' . esc_attr( $item['id'] ) . '">';
</ins><span class="cx"> echo $this->single_row_columns( $item );
</span><span class="cx"> echo '</tr>';
</span><span class="cx"> }
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> $actions['delete'] = sprintf( '<a href="%s">%s</a>', esc_url( $delete_url ), __( 'Delete', 'buddypress' ) );
</span><span class="cx">
</span><span class="cx"> // Other plugins can filter which actions are shown
</span><del>- $actions = apply_filters( 'bp_activity_admin_comment_row_actions', array_filter( $actions ), $item );
</del><ins>+ $actions = apply_filters( 'bp_groups_admin_comment_row_actions', array_filter( $actions ), $item );
</ins><span class="cx">
</span><span class="cx"> // Get group name and avatar
</span><span class="cx"> $avatar = bp_core_fetch_avatar( array(
</span></span></pre>
</div>
</div>
</body>
</html>