<!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][4400] trunk: Correct phpdoc for $bp global</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>4400</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-20 19:33:20 +0000 (Fri, 20 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct phpdoc for $bp global</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersactionsphp">trunk/bp-members/bp-members-actions.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileactionsphp">trunk/bp-xprofile/bp-xprofile-actions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileactivityphp">trunk/bp-xprofile/bp-xprofile-activity.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilebuddybarphp">trunk/bp-xprofile/bp-xprofile-buddybar.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="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-activity/bp-activity-template.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -207,14 +207,13 @@
</span><span class="cx"> *
</span><span class="cx"> * Based on the $args passed, bp_has_activities() populates the $activities_template global.
</span><span class="cx"> *
</span><del>- * @package BuddyPress Activity
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- *
</del><ins>+ * @global BP_Activity_Template $activities_template
+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param mixed $args Arguments for limiting the contents of the activity loop. Can be passed as an associative array or as a URL argument string
</span><span class="cx"> * @return bool Returns true when activities are found
</span><span class="cx"> */
</span><span class="cx"> function bp_has_activities( $args = '' ) {
</span><del>- global $bp, $activities_template;
</del><ins>+ global $activities_template, $bp;
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * Set the defaults based on the current page. Any of these will be overridden
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-core/admin/bp-core-update.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -1172,7 +1172,7 @@
</span><span class="cx"> * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $wpdb WordPress DB access object.
</span><span class="cx"> * @uses add_submenu_page() WP function to add a submenu item
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-core/bp-core-avatars.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> * Fetches an avatar from a BuddyPress object. Supports user/group/blog as
</span><span class="cx"> * default, but can be extended to include your own custom components too.
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
</span><span class="cx"> * @param array $args Determine the output of this function
</span><span class="cx"> * @return string Formatted HTML <img> element, or raw avatar URL based on $html arg
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-core/bp-core-buddybar.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * Adds a navigation item to the main navigation array used in BuddyPress themes.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_new_nav_item( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> * Modify the default subnav item to load when a top level nav item is clicked.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_new_nav_default( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> * plugins have registered their navigation items.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_sort_nav_items() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> * Adds a navigation item to the sub navigation array used in BuddyPress themes.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_new_subnav_item( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @param $parent_id The id of the parent navigation item.
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_reset_subnav_items( $parent_slug ) {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-core/bp-core-functions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses is_super_admin() returns true if the current user is a site admin, false if not
</span><span class="cx"> * @uses add_submenu_page() WP function to add a submenu item
</span><span class="cx"> */
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @since 1.3
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses is_super_admin() to check current user permissions before showing the notices
</span><span class="cx"> * @uses bp_is_root_blog()
</span><span class="cx"> */
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @since 1.3
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param string $notice The notice you are adding to the queue
</span><span class="cx"> */
</span><span class="cx"> function bp_core_add_admin_notice( $notice ) {
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> * The hook action 'template_notices' is used to call this function, it is not called directly.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_render_message() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> * A javascript free implementation of the search functions in BuddyPress
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param string $slug The slug to redirect to for searching.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_action_search_site( $slug = '' ) {
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-core/bp-core-template.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> * or not to highlight a particular sub nav item.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses bp_get_user_nav() Renders the navigation for a profile of a currently viewed user.
</span><span class="cx"> */
</span><span class="cx"> function bp_get_options_nav() {
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> * like a group, or a friend. Basically an avatar that appears in the sub nav options bar.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_has_options_avatar() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @since 1.3
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param string $component Optional. Defaults to the current component
</span><span class="cx"> * @return string $root_slug The root slug
</span><span class="cx"> */
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> * Return the component name based on the current root slug
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress {r3923}
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param str $root_slug Needle to our active component haystack
</span><span class="cx"> * @return mixed False if none found, component name if found
</span><span class="cx"> */
</span><span class="lines">@@ -844,7 +844,7 @@
</span><span class="cx"> * Checks if the site's front page is set to the specified BuddyPress component
</span><span class="cx"> * page in wp-admin's Settings > Reading screen.
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $current_blog WordPress global for the current blog
</span><span class="cx"> * @param string $component Optional; Name of the component to check for.
</span><span class="cx"> * @return bool True If the specified component is set to be the site's front page.
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-forums/bp-forums-functions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> * Convenience function to determine if the forum directory has been disabled
</span><span class="cx"> * by the site admin.
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @return bool True if forum is disabled
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpmembersbpmembersactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-actions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-actions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-members/bp-members-actions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> * directory page. If they are, it will set up the directory and load the members directory template.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses wp_enqueue_script() Loads a JS script into the header of the page.
</span><span class="cx"> * @uses bp_core_load_template() Loads a specific template file.
</span><span class="cx"> */
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * Must be a site admin for this function to run.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_members_action_set_spammer_status() {
</span><span class="cx"> global $bp, $wpdb, $wp_version;
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> * Allows a site admin to delete a user from the adminbar menu.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_members_action_delete_user() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-members/bp-members-functions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> * explicitly defined.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_define_slugs() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> * Otherwise, it will fall back to the normal WP display_name, or user_nicename, depending on what has been set.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses wp_cache_get() Will try and fetch the value from the cache, rather than querying the DB again.
</span><span class="cx"> * @uses get_userdata() Fetches the WP userdata for a specific user.
</span><span class="cx"> * @uses xprofile_set_field_data() Will update the field data for a user based on field name and user id.
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> * Fetch every post that is authored by the given user for the current blog.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $wpdb WordPress user data for the current logged in user.
</span><span class="cx"> * @return array of post ids.
</span><span class="cx"> */
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> * Allows a user to completely remove their account from the system
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses is_super_admin() Checks to see if the user is a site administrator.
</span><span class="cx"> * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
</span><span class="cx"> * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-members/bp-members-template.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @todo Move to a back-compat file?
</span><span class="cx"> * @deprecated Does not seem to be called anywhere in the core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_get_loggedin_user_nav() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> * yourself.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> */
</span><span class="cx"> function bp_get_displayed_user_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx"> *
</span><span class="cx"> * AJAX handler for autocomplete. Displays friends only, unless BP_MESSAGES_AUTOCOMPLETE_ALL is defined
</span><span class="cx"> *
</span><del>- * @global object $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object object $bp Global BuddyPress settings object
</ins><span class="cx"> * @return none
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_ajax_messages_autocomplete_results() {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-themes/bp-default/functions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> * To override bp_dtheme_setup() in a child theme, add your own bp_dtheme_setup to your child theme's
</span><span class="cx"> * functions.php file.
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_setup() {
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Enqueue theme javascript safely
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @see http://codex.wordpress.org/Function_Reference/wp_enqueue_script
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Used when the custom menus haven't been configured.
</span><span class="cx"> *
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @param array Menu arguments from wp_nav_menu()
</span><span class="cx"> * @see wp_nav_menu()
</span><span class="cx"> * @since 1.3
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-actions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-actions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-xprofile/bp-xprofile-actions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> * The function will delete the active avatar for a user.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Xprofile
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses bp_core_delete_avatar() Deletes the active avatar for the logged in user.
</span><span class="cx"> * @uses add_action() Runs a specific function for an action when it fires.
</span><span class="cx"> * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-activity.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-activity.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-xprofile/bp-xprofile-activity.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><span class="cx"> * @param $args Array containing all variables used after extract() call
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global $bp The global BuddyPress settings variable created in bp_core_current_times()
</ins><span class="cx"> * @uses bp_activity_record() Adds an entry to the activity component tables for a specific activity
</span><span class="cx"> */
</span><span class="cx"> function xprofile_record_activity( $args = '' ) {
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><span class="cx"> * @param $args Array containing all variables used after extract() call
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses bp_activity_delete() Deletes an entry to the activity component tables for a specific activity
</span><span class="cx"> */
</span><span class="cx"> function xprofile_delete_activity( $args = '' ) {
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> * Adds an activity stream item when a user has uploaded a new avatar.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses bp_activity_add() Adds an entry to the activity component tables for a specific activity
</span><span class="cx"> */
</span><span class="cx"> function bp_xprofile_new_avatar_activity() {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-buddybar.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-buddybar.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-xprofile/bp-xprofile-buddybar.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> * tables are set up.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $wpdb WordPress DB access object.
</span><span class="cx"> * @uses is_super_admin() returns true if the current user is a site admin, false if not
</span><span class="cx"> * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> * @package BuddyPress XProfile
</span><span class="cx"> *
</span><span class="cx"> * @global $wpdb WordPress DB access object.
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> *
</span><span class="cx"> * @param array $args Takes an array of parameters:
</span><span class="cx"> * 'profile_group_id' - Limit results to a single profile group
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (4399 => 4400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2011-05-20 19:30:17 UTC (rev 4399)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2011-05-20 19:33:20 UTC (rev 4400)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @param mixed $field The ID of the field, or the $name of the field.
</span><span class="cx"> * @param int $user_id The ID of the user
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses BP_XProfile_ProfileData::get_value_byid() Fetches the value based on the params passed.
</span><span class="cx"> * @return mixed The profile field data.
</span><span class="cx"> */
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> * @param $field The ID of the field, or the $name of the field.
</span><span class="cx"> * @param $user_id The ID of the user
</span><span class="cx"> * @param $value The value for the field you want to set for the user.
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @uses xprofile_get_field_id_from_name() Gets the ID for the field based on the name.
</span><span class="cx"> * @return true on success, false on failure.
</span><span class="cx"> */
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @param $user_id User ID of the user to get random data for
</span><span class="cx"> * @param $exclude_fullname whether or not to exclude the full name field as random data.
</span><del>- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</del><ins>+ * @global object $bp Global BuddyPress settings object
</ins><span class="cx"> * @global $wpdb WordPress DB access object.
</span><span class="cx"> * @global $current_user WordPress global variable containing current logged in user information
</span><span class="cx"> * @uses xprofile_format_profile_field() Formats profile field data so it is suitable for display.
</span></span></pre>
</div>
</div>
</body>
</html>