<!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][4398] trunk: Remove calls to 1.2-era _setup_globals(); the functions have been removed</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>4398</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-20 19:13:33 +0000 (Fri, 20 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove calls to 1.2-era _setup_globals(); the functions have been removed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsactivityphp">trunk/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunkbpblogsbpblogsclassesphp">trunk/bp-blogs/bp-blogs-classes.php</a></li>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-activity.php (4397 => 4398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-activity.php 2011-05-20 18:53:38 UTC (rev 4397)
+++ trunk/bp-blogs/bp-blogs-activity.php 2011-05-20 19:13:33 UTC (rev 4398)
</span><span class="lines">@@ -25,14 +25,6 @@
</span><span class="cx"> if ( !bp_is_active( 'activity' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /**
- * Because blog, comment, and blog post code execution happens before
- * anything else we may need to manually instantiate the activity
- * component globals.
- */
- if ( !$bp->activity && bp_is_active( 'activity' ) )
- bp_activity_setup_globals();
-
</del><span class="cx"> $defaults = array(
</span><span class="cx"> 'user_id' => $bp->loggedin_user->id,
</span><span class="cx"> 'action' => '',
</span></span></pre></div>
<a id="trunkbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-classes.php (4397 => 4398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-classes.php 2011-05-20 18:53:38 UTC (rev 4397)
+++ trunk/bp-blogs/bp-blogs-classes.php 2011-05-20 19:13:33 UTC (rev 4398)
</span><span class="lines">@@ -75,9 +75,6 @@
</span><span class="cx"> function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
</span><span class="cx"> $hidden_sql = "AND wb.public = 1";
</span><span class="cx"> else
</span><span class="lines">@@ -125,20 +122,13 @@
</span><span class="cx"> function delete_blog_for_all( $blog_id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> bp_blogs_delete_blogmeta( $blog_id );
</span><del>-
</del><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function delete_blog_for_user( $blog_id, $user_id = null ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="lines">@@ -148,9 +138,6 @@
</span><span class="cx"> function delete_blogs_for_user( $user_id = null ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="lines">@@ -160,9 +147,6 @@
</span><span class="cx"> function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><span class="lines">@@ -189,9 +173,6 @@
</span><span class="cx"> function get_blog_ids_for_user( $user_id = 0 ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><span class="lines">@@ -201,18 +182,12 @@
</span><span class="cx"> function is_recorded( $blog_id ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function total_blog_count_for_user( $user_id = null ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><span class="lines">@@ -226,9 +201,6 @@
</span><span class="cx"> function search_blogs( $filter, $limit = null, $page = null ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> $filter = like_escape( $wpdb->escape( $filter ) );
</span><span class="cx">
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="lines">@@ -246,11 +218,7 @@
</span><span class="cx"> function get_all( $limit = null, $page = null ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> $hidden_sql = !is_super_admin() ? "AND wb.public = 1" : '';
</span><del>-
</del><span class="cx"> $pag_sql = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
</span><span class="cx">
</span><span class="cx"> $paged_blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" ) );
</span><span class="lines">@@ -262,9 +230,6 @@
</span><span class="cx"> function get_by_letter( $letter, $limit = null, $page = null ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> $letter = like_escape( $wpdb->escape( $letter ) );
</span><span class="cx">
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="lines">@@ -306,14 +271,10 @@
</span><span class="cx"> function is_hidden( $blog_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( !$bp->blogs )
- bp_blogs_setup_globals();
-
</del><span class="cx"> if ( !(int)$wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT public FROM {$wpdb->base_prefix}blogs WHERE blog_id = %d", $blog_id ) ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (4397 => 4398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2011-05-20 18:53:38 UTC (rev 4397)
+++ trunk/bp-core/bp-core-classes.php 2011-05-20 19:13:33 UTC (rev 4398)
</span><span class="lines">@@ -374,10 +374,6 @@
</span><span class="cx">
</span><span class="cx"> // Fetch the user's full name
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
</span><del>- // Ensure xprofile globals are set
- if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )
- xprofile_setup_globals();
-
</del><span class="cx"> $names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id as id, pd.value as fullname FROM {$bp->profile->table_name_fields} pf, {$bp->profile->table_name_data} pd WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} )", BP_XPROFILE_FULLNAME_FIELD_NAME ) );
</span><span class="cx"> for ( $i = 0; $i < count( $paged_users ); $i++ ) {
</span><span class="cx"> foreach ( (array)$names as $name ) {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (4397 => 4398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2011-05-20 18:53:38 UTC (rev 4397)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2011-05-20 19:13:33 UTC (rev 4398)
</span><span class="lines">@@ -888,9 +888,6 @@
</span><span class="cx"> if ( !$user_ids )
</span><span class="cx"> $user_ids = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- if ( !$bp->profile )
- xprofile_setup_globals();
-
</del><span class="cx"> if ( is_array( $user_ids ) ) {
</span><span class="cx"> $user_ids = implode( ',', (array) $user_ids );
</span><span class="cx"> $data = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, value FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id IN ({$user_ids})", $field_id ) );
</span><span class="lines">@@ -910,9 +907,6 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- if ( !$bp->profile )
- xprofile_setup_globals();
-
</del><span class="cx"> $field_sql = '';
</span><span class="cx">
</span><span class="cx"> if ( is_array( $fields ) ) {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (4397 => 4398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2011-05-20 18:53:38 UTC (rev 4397)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2011-05-20 19:13:33 UTC (rev 4398)
</span><span class="lines">@@ -151,10 +151,6 @@
</span><span class="cx"> function xprofile_get_field_data( $field, $user_id = 0 ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- // This is required because of a call to bp_core_get_user_displayname() in bp_core_setup_globals()
- if ( !isset( $bp->profile->id ) )
- xprofile_setup_globals();
-
</del><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>