<!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][3871] trunk/bp-groups/bp-groups-classes.php: More pass-by-value cleanup, this time in bp-groups-classes.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>3871</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 06:19:13 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More pass-by-value cleanup, this time in bp-groups-classes.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (3870 => 3871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2011-01-24 05:45:46 UTC (rev 3870)
+++ trunk/bp-groups/bp-groups-classes.php 2011-01-24 06:19:13 UTC (rev 3871)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> $group_ids = array();
</span><span class="cx"> foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
</span><span class="cx"> $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
</span><del>- $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, $type );
</del><ins>+ $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, $type );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unset( $sql, $total_sql );
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> if ( !empty( $populate_extras ) ) {
</span><span class="cx"> foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
</span><span class="cx"> $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
</span><del>- $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
</del><ins>+ $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return array( 'groups' => $paged_groups, 'total' => $total_groups );
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> if ( !empty( $populate_extras ) ) {
</span><span class="cx"> foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
</span><span class="cx"> $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
</span><del>- $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
</del><ins>+ $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return array( 'groups' => $paged_groups, 'total' => $total_groups );
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> if ( !empty( $populate_extras ) ) {
</span><span class="cx"> foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
</span><span class="cx"> $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
</span><del>- $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
</del><ins>+ $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return array( 'groups' => $paged_groups, 'total' => $total_groups );
</span><span class="lines">@@ -513,13 +513,13 @@
</span><span class="cx"> if ( !empty( $populate_extras ) ) {
</span><span class="cx"> foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
</span><span class="cx"> $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
</span><del>- $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
</del><ins>+ $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return array( 'groups' => $paged_groups, 'total' => $total_groups );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_group_extras( $paged_groups, $group_ids, $type = false ) {
</del><ins>+ function get_group_extras( &$paged_groups, &$group_ids, $type = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $group_ids ) )
</span><span class="lines">@@ -1140,10 +1140,10 @@
</span><span class="cx"> $bp->groups->group_creation_steps[$this->slug] = array( 'name' => $this->name, 'slug' => $this->slug, 'position' => $this->create_step_position );
</span><span class="cx">
</span><span class="cx"> // Attach the group creation step display content action
</span><del>- add_action( 'groups_custom_create_steps', array( &$this, 'create_screen' ) );
</del><ins>+ add_action( 'groups_custom_create_steps', array( $this, 'create_screen' ) );
</ins><span class="cx">
</span><span class="cx"> // Attach the group creation step save content action
</span><del>- add_action( 'groups_create_group_step_save_' . $this->slug, array( &$this, 'create_screen_save' ) );
</del><ins>+ add_action( 'groups_create_group_step_save_' . $this->slug, array( $this, 'create_screen_save' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Construct the admin edit tab for the new group extension
</span><span class="lines">@@ -1155,13 +1155,13 @@
</span><span class="cx"> // Check whether the user is saving changes
</span><span class="cx"> $this->edit_screen_save();
</span><span class="cx">
</span><del>- add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
</del><ins>+ add_action( 'groups_custom_edit_steps', array( $this, 'edit_screen' ) );
</ins><span class="cx">
</span><span class="cx"> if ( '' != locate_template( array( 'groups/single/home.php' ), false ) ) {
</span><span class="cx"> bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
</span><span class="cx"> } else {
</span><span class="cx"> add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
</span><del>- add_action( 'bp_template_content', array( &$this, 'edit_screen' ) );
</del><ins>+ add_action( 'bp_template_content', array( $this, 'edit_screen' ) );
</ins><span class="cx"> bp_core_load_template( apply_filters( 'bp_core_template_plugin', '/groups/single/plugins' ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> if ( $this->visibility == 'public' || ( $this->visibility != 'public' && $bp->groups->current_group->user_has_access ) ) {
</span><span class="cx"> if ( $this->enable_nav_item ) {
</span><span class="cx"> if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item )
</span><del>- bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( &$this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
</del><ins>+ bp_core_new_subnav_item( array( 'name' => ( !$this->nav_item_name ) ? $this->name : $this->nav_item_name, 'slug' => $this->slug, 'parent_slug' => BP_GROUPS_SLUG, 'parent_url' => bp_get_group_permalink( $bp->groups->current_group ), 'position' => $this->nav_item_position, 'item_css_id' => 'nav-' . $this->slug, 'screen_function' => array( $this, '_display_hook' ), 'user_has_access' => $this->enable_nav_item ) );
</ins><span class="cx">
</span><span class="cx"> // When we are viewing the extension display page, set the title and options title
</span><span class="cx"> if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && $bp->current_action == $this->slug ) {
</span><span class="lines">@@ -1182,12 +1182,12 @@
</span><span class="cx">
</span><span class="cx"> // Hook the group home widget
</span><span class="cx"> if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
</span><del>- add_action( $this->display_hook, array( &$this, 'widget_display' ) );
</del><ins>+ add_action( $this->display_hook, array( $this, 'widget_display' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _display_hook() {
</span><del>- add_action( 'bp_template_content', array( &$this, 'display' ) );
</del><ins>+ add_action( 'bp_template_content', array( $this, 'display' ) );
</ins><span class="cx"> bp_core_load_template( apply_filters( 'bp_core_template_plugin', $this->template_file ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1199,8 +1199,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Register the group extension on the bp_init action so we have access to all plugins */
</span><del>- add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ), 11 );
</del><ins>+ add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( $extension, "_register" ), 2 );' ), 11 );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>