<!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][7052] trunk/bp-groups/bp-groups-classes.php: Don't use extract() in BP_Groups_Group::get()</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/7052">7052</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-11 11:42:36 +0000 (Sat, 11 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use extract() in BP_Groups_Group::get()
extract() is not cool.</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 (7051 => 7052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2013-05-09 14:26:50 UTC (rev 7051)
+++ trunk/bp-groups/bp-groups-classes.php 2013-05-11 11:42:36 UTC (rev 7052)
</span><span class="lines">@@ -345,7 +345,6 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r );
</del><span class="cx">
</span><span class="cx"> $sql = array();
</span><span class="cx"> $total_sql = array();
</span><span class="lines">@@ -353,25 +352,25 @@
</span><span class="cx"> $sql['select'] = "SELECT g.*, gm1.meta_value AS total_member_count, gm2.meta_value AS last_activity";
</span><span class="cx"> $sql['from'] = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2,";
</span><span class="cx">
</span><del>- if ( !empty( $user_id ) )
</del><ins>+ if ( !empty( $r['user_id'] ) )
</ins><span class="cx"> $sql['members_from'] = " {$bp->groups->table_name_members} m,";
</span><span class="cx">
</span><span class="cx"> $sql['group_from'] = " {$bp->groups->table_name} g WHERE";
</span><span class="cx">
</span><del>- if ( !empty( $user_id ) )
</del><ins>+ if ( !empty( $r['user_id'] ) )
</ins><span class="cx"> $sql['user_where'] = " g.id = m.group_id AND";
</span><span class="cx">
</span><span class="cx"> $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
</span><span class="cx">
</span><del>- if ( empty( $show_hidden ) )
</del><ins>+ if ( empty( $r['show_hidden'] ) )
</ins><span class="cx"> $sql['hidden'] = " AND g.status != 'hidden'";
</span><span class="cx">
</span><del>- if ( !empty( $search_terms ) ) {
- $search_terms = esc_sql( like_escape( $search_terms ) );
</del><ins>+ if ( !empty( $r['search_terms'] ) ) {
+ $search_terms = esc_sql( like_escape( $r['search_terms'] ) );
</ins><span class="cx"> $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $meta_query_sql = self::get_meta_query_sql( $meta_query );
</del><ins>+ $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $meta_query_sql['join'] ) ) {
</span><span class="cx"> $sql['from'] .= $meta_query_sql['join'];
</span><span class="lines">@@ -382,22 +381,22 @@
</span><span class="cx"> $sql['meta'] = $meta_query_sql['where'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $user_id ) )
- $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id );
</del><ins>+ if ( !empty( $r['user_id'] ) )
+ $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $r['user_id'] );
</ins><span class="cx">
</span><del>- if ( !empty( $include ) ) {
</del><ins>+ if ( !empty( $r['include'] ) ) {
</ins><span class="cx"> $include = wp_parse_id_list( $r['include'] );
</span><span class="cx"> $include = $wpdb->escape( implode( ',', $include ) );
</span><span class="cx"> $sql['include'] = " AND g.id IN ({$include})";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $exclude ) ) {
</del><ins>+ if ( !empty( $r['exclude'] ) ) {
</ins><span class="cx"> $exclude = wp_parse_id_list( $r['exclude'] );
</span><span class="cx"> $exclude = $wpdb->escape( implode( ',', $exclude ) );
</span><span class="cx"> $sql['exclude'] = " AND g.id NOT IN ({$exclude})";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch ( $type ) {
</del><ins>+ switch ( $r['type'] ) {
</ins><span class="cx"> case 'newest': default:
</span><span class="cx"> $sql['order'] = " ORDER BY g.date_created DESC";
</span><span class="cx"> break;
</span><span class="lines">@@ -415,8 +414,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $per_page ) && !empty( $page ) )
- $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page), intval( $per_page ) );
</del><ins>+ if ( !empty( $r['per_page'] ) && !empty( $r['page'] ) )
+ $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['per_page']), intval( $r['per_page'] ) );
</ins><span class="cx">
</span><span class="cx"> // Get paginated results
</span><span class="cx"> $paged_groups_sql = apply_filters( 'bp_groups_get_paged_groups_sql', join( ' ', (array) $sql ), $sql );
</span><span class="lines">@@ -424,7 +423,7 @@
</span><span class="cx">
</span><span class="cx"> $total_sql['select'] = "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name} g, {$bp->groups->table_name_members} gm1, {$bp->groups->table_name_groupmeta} gm2";
</span><span class="cx">
</span><del>- if ( !empty( $user_id ) )
</del><ins>+ if ( !empty( $r['user_id'] ) )
</ins><span class="cx"> $total_sql['select'] .= ", {$bp->groups->table_name_members} m";
</span><span class="cx">
</span><span class="cx"> if ( !empty( $sql['hidden'] ) )
</span><span class="lines">@@ -433,7 +432,7 @@
</span><span class="cx"> if ( !empty( $sql['search'] ) )
</span><span class="cx"> $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
</span><span class="cx">
</span><del>- if ( !empty( $user_id ) )
</del><ins>+ if ( !empty( $r['user_id'] ) )
</ins><span class="cx"> $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
</span><span class="cx">
</span><span class="cx"> // Already escaped in the paginated results block
</span><span class="lines">@@ -463,9 +462,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Populate some extra information instead of querying each time in the loop
</span><del>- if ( !empty( $populate_extras ) ) {
</del><ins>+ if ( !empty( $r['populate_extras'] ) ) {
</ins><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, $r['type'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Grab all groupmeta
</span></span></pre>
</div>
</div>
</body>
</html>