<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [1705] trunk: Added internal ID's to all components.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1705</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-26 16:21:57 +0000 (Wed, 26 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added internal ID's to all components.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
<li><a href="#trunkbpwirephp">trunk/bp-wire.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-activity.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-define ( 'BP_ACTIVITY_DB_VERSION', '1700' );
</del><ins>+define ( 'BP_ACTIVITY_DB_VERSION', '1721' );
</ins><span class="cx">
</span><span class="cx"> /* Define the slug for the component */
</span><span class="cx"> if ( !defined( 'BP_ACTIVITY_SLUG' ) )
</span><span class="lines">@@ -45,26 +45,37 @@
</span><span class="cx"> $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_user_activity" );
</span><span class="cx"> $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_sitewide" );
</span><span class="cx">
</span><ins>+ /* Rename the old user activity cached table */
+ $wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
+
</ins><span class="cx"> update_site_option( 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_setup_globals() {
</span><span class="cx"> global $bp, $wpdb, $current_blog;
</span><span class="cx">
</span><del>- $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
</del><ins>+ /* Internal identifier */
+ $bp->activity->id = 'activity';
+
+ $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity';
</ins><span class="cx"> $bp->activity->slug = BP_ACTIVITY_SLUG;
</span><ins>+}
+add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
+add_action( 'admin_menu', 'bp_activity_setup_globals', 2 );
</ins><span class="cx">
</span><del>- if ( is_site_admin() && get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION )
</del><ins>+function bp_activity_check_installed() {
+ global $wpdb, $bp;
+
+// if ( get_site_option('bp-activity-db-version') < BP_ACTIVITY_DB_VERSION )
</ins><span class="cx"> bp_activity_install();
</span><span class="cx"> }
</span><del>-add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
-add_action( 'admin_menu', 'bp_activity_setup_globals', 1 );
</del><ins>+add_action( 'admin_menu', 'bp_activity_check_installed' );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_setup_root_component() {
</span><span class="cx"> /* Register 'activity' as a root component (for RSS feed use) */
</span><span class="cx"> bp_core_add_root_component( BP_ACTIVITY_SLUG );
</span><span class="cx"> }
</span><del>-add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 1 );
</del><ins>+add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 2 );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_setup_nav() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-blogs.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -106,8 +106,10 @@
</span><span class="cx">
</span><span class="cx"> function bp_blogs_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span><del>-
</del><ins>+
+ /* For internal identification */
</ins><span class="cx"> $bp->blogs->id = 'blogs';
</span><ins>+
</ins><span class="cx"> $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
</span><span class="cx"> $bp->blogs->table_name_blog_posts = $wpdb->base_prefix . 'bp_user_blogs_posts';
</span><span class="cx"> $bp->blogs->table_name_blog_comments = $wpdb->base_prefix . 'bp_user_blogs_comments';
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-forums.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -11,7 +11,10 @@
</span><span class="cx">
</span><span class="cx"> function bp_forums_setup() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
+ /* For internal identification */
+ $bp->forums->id = 'forums';
+
</ins><span class="cx"> $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
</span><span class="cx"> $bp->forums->bbconfig = get_site_option( 'bb-config-location' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-friends.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -38,14 +38,15 @@
</span><span class="cx">
</span><span class="cx"> function friends_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span><del>-
</del><ins>+
+ /* For internal identification */
+ $bp->friends->id = 'friends';
+
</ins><span class="cx"> $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
</span><span class="cx"> $bp->friends->format_activity_function = 'friends_format_activity';
</span><span class="cx"> $bp->friends->format_notification_function = 'friends_format_notifications';
</span><del>-
</del><span class="cx"> $bp->friends->slug = BP_FRIENDS_SLUG;
</span><span class="cx">
</span><del>- $bp->version_numbers->friends = BP_FRIENDS_VERSION;
</del><span class="cx"> }
</span><span class="cx"> add_action( 'plugins_loaded', 'friends_setup_globals', 5 );
</span><span class="cx"> add_action( 'admin_menu', 'friends_setup_globals', 1 );
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-groups.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -97,7 +97,10 @@
</span><span class="cx">
</span><span class="cx"> function groups_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span><del>-
</del><ins>+
+ /* For internal identification */
+ $bp->groups->id = 'groups';
+
</ins><span class="cx"> $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
</span><span class="cx"> $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';
</span><span class="cx"> $bp->groups->table_name_groupmeta = $wpdb->base_prefix . 'bp_groups_groupmeta';
</span></span></pre></div>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-messages.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -73,6 +73,9 @@
</span><span class="cx">
</span><span class="cx"> function messages_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span><ins>+
+ /* For internal identification */
+ $bp->messages->id = 'messages';
</ins><span class="cx">
</span><span class="cx"> $bp->messages->table_name_threads = $wpdb->base_prefix . 'bp_messages_threads';
</span><span class="cx"> $bp->messages->table_name_messages = $wpdb->base_prefix . 'bp_messages_messages';
</span><span class="lines">@@ -80,10 +83,7 @@
</span><span class="cx"> $bp->messages->table_name_notices = $wpdb->base_prefix . 'bp_messages_notices';
</span><span class="cx"> $bp->messages->format_activity_function = 'messages_format_activity';
</span><span class="cx"> $bp->messages->format_notification_function = 'messages_format_notifications';
</span><del>- $bp->messages->image_base = BP_PLUGIN_URL . '/bp-messages/images';
</del><span class="cx"> $bp->messages->slug = BP_MESSAGES_SLUG;
</span><del>-
- $bp->version_numbers->messages = BP_MESSAGES_VERSION;
</del><span class="cx"> }
</span><span class="cx"> add_action( 'plugins_loaded', 'messages_setup_globals', 5 );
</span><span class="cx"> add_action( 'admin_menu', 'messages_setup_globals', 1 );
</span></span></pre></div>
<a id="trunkbpwirephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-wire.php (1704 => 1705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-wire.php 2009-08-26 14:11:08 UTC (rev 1704)
+++ trunk/bp-wire.php 2009-08-26 16:21:57 UTC (rev 1705)
</span><span class="lines">@@ -18,11 +18,11 @@
</span><span class="cx">
</span><span class="cx"> function bp_wire_setup_globals() {
</span><span class="cx"> global $bp, $wpdb;
</span><ins>+
+ /* For internal identification */
+ $bp->wire->id = 'wire';
</ins><span class="cx">
</span><del>- $bp->wire->image_base = BP_PLUGIN_URL . '/bp-wire/images';
</del><span class="cx"> $bp->wire->slug = BP_WIRE_SLUG;
</span><del>-
- $bp->version_numbers->wire = BP_WIRE_VERSION;
</del><span class="cx"> }
</span><span class="cx"> add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 );
</span><span class="cx"> add_action( 'admin_menu', 'bp_wire_setup_globals', 1 );
</span></span></pre>
</div>
</div>
</body>
</html>