<!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] [2742] branches/1.2:
Move DB version checks back to checking the DB instead of pre-fetched site options
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2742</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-18 18:50:35 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move DB version checks back to checking the DB instead of pre-fetched site options. Fixes #1947</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
<li><a href="#branches12bpblogsphp">branches/1.2/bp-blogs.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
<li><a href="#branches12bpfriendsphp">branches/1.2/bp-friends.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bploaderphp">branches/1.2/bp-loader.php</a></li>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
<li><a href="#branches12bpxprofilephp">branches/1.2/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-activity.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> function bp_activity_check_installed() {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( $bp->site_options['bp-activity-db-version'] < BP_ACTIVITY_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION )
</ins><span class="cx"> bp_activity_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_activity_check_installed' );
</span></span></pre></div>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-blogs.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> /* Only create the bp-blogs tables if this is a multisite install */
</span><span class="cx"> if ( is_site_admin() && bp_core_is_multisite() ) {
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-blogs-db-version'] < BP_BLOGS_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-blogs-db-version' ) < BP_BLOGS_DB_VERSION )
</ins><span class="cx"> bp_blogs_install();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-core.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-core/bp-core-admin.php' );
</span><span class="cx">
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-core-db-version'] < BP_CORE_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-core-db-version' ) < BP_CORE_DB_VERSION )
</ins><span class="cx"> bp_core_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_core_check_installed' );
</span><span class="lines">@@ -1559,13 +1559,6 @@
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> $options = apply_filters( 'bp_core_site_options', array(
</span><del>- 'bp-core-db-version',
- 'bp-activity-db-version',
- 'bp-blogs-db-version',
- 'bp-friends-db-version',
- 'bp-groups-db-version',
- 'bp-messages-db-version',
- 'bp-xprofile-db-version',
</del><span class="cx"> 'bp-deactivated-components',
</span><span class="cx"> 'bp-blogs-first-install',
</span><span class="cx"> 'bp-disable-blog-forum-comments',
</span></span></pre></div>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-friends.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-friends-db-version'] < BP_FRIENDS_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-friends-db-version' ) < BP_FRIENDS_DB_VERSION )
</ins><span class="cx"> friends_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'friends_check_installed' );
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-groups.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> function groups_check_installed() {
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-groups-db-version'] < BP_GROUPS_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-groups-db-version' ) < BP_GROUPS_DB_VERSION )
</ins><span class="cx"> groups_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'groups_check_installed' );
</span></span></pre></div>
<a id="branches12bploaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-loader.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-loader.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-loader.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -21,21 +21,21 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_core_loaded' );
</span><span class="cx">
</span><del>-/* Activity Streams */
-if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
- include( BP_PLUGIN_DIR . '/bp-activity.php' );
</del><ins>+// /* Activity Streams */
+// if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
+// include( BP_PLUGIN_DIR . '/bp-activity.php' );
</ins><span class="cx">
</span><del>-/* Blog Tracking */
-if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
- include( BP_PLUGIN_DIR . '/bp-blogs.php' );
</del><ins>+// /* Blog Tracking */
+// if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
+// include( BP_PLUGIN_DIR . '/bp-blogs.php' );
</ins><span class="cx">
</span><del>-/* bbPress Forum Integration */
-if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
- include( BP_PLUGIN_DIR . '/bp-forums.php' );
</del><ins>+// /* bbPress Forum Integration */
+// if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
+// include( BP_PLUGIN_DIR . '/bp-forums.php' );
</ins><span class="cx">
</span><del>-/* Friend Connections */
-if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
- include( BP_PLUGIN_DIR . '/bp-friends.php' );
</del><ins>+// /* Friend Connections */
+// if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
+// include( BP_PLUGIN_DIR . '/bp-friends.php' );
</ins><span class="cx">
</span><span class="cx"> /* Groups Support */
</span><span class="cx"> if ( !isset( $bp_deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
</span></span></pre></div>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-messages.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-messages-db-version'] < BP_MESSAGES_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-messages-db-version' ) < BP_MESSAGES_DB_VERSION )
</ins><span class="cx"> messages_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'messages_check_installed' );
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (2741 => 2742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2010-02-18 16:49:30 UTC (rev 2741)
+++ branches/1.2/bp-xprofile.php 2010-02-18 18:50:35 UTC (rev 2742)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> add_submenu_page( 'bp-general-settings', __("Profile Field Setup", 'buddypress'), __("Profile Field Setup", 'buddypress'), 'manage_options', 'bp-profile-setup', "xprofile_admin" );
</span><span class="cx">
</span><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><del>- if ( $bp->site_options['bp-xprofile-db-version'] < BP_XPROFILE_DB_VERSION )
</del><ins>+ if ( get_site_option( 'bp-xprofile-db-version' ) < BP_XPROFILE_DB_VERSION )
</ins><span class="cx"> xprofile_install();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_menu' );
</span></span></pre>
</div>
</div>
</body>
</html>