<!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] [2721] trunk/bp-xprofile.php: Fixes #1933</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2721</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-15 10:46:16 +0000 (Mon, 15 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1933</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2720 => 2721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-02-15 10:39:25 UTC (rev 2720)
+++ trunk/bp-xprofile.php 2010-02-15 10:46:16 UTC (rev 2721)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> if ( !empty($wpdb->charset) )
</span><span class="cx"> $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
</span><span class="cx">
</span><del>- if ( empty( $bp->option['bp-xprofile-base-group-name'] ) )
</del><ins>+ if ( empty( $bp->site_options['bp-xprofile-base-group-name'] ) )
</ins><span class="cx"> update_site_option( 'bp-xprofile-base-group-name', 'Base' );
</span><span class="cx">
</span><del>- if ( empty( $bp->option['bp-xprofile-fullname-field-name'] ) )
</del><ins>+ if ( empty( $bp->site_options['bp-xprofile-fullname-field-name'] ) )
</ins><span class="cx"> update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
</span><span class="cx">
</span><span class="cx"> $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> KEY user_id (user_id)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- if ( empty( $bp->option['bp-xprofile-db-version'] ) ) {
</del><ins>+ if ( empty( $bp->site_options['bp-xprofile-db-version'] ) ) {
</ins><span class="cx"> if ( !$wpdb->get_var( "SELECT id FROM {$bp->profile->table_name_groups} WHERE id = 1" ) )
</span><span class="cx"> $sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
</span><span class="cx">
</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->option['bp-xprofile-db-version'] < BP_XPROFILE_DB_VERSION )
</del><ins>+ if ( $bp->site_options['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 class="lines">@@ -866,7 +866,7 @@
</span><span class="cx"> function xprofile_sync_wp_profile() {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( (int)$bp->option['bp-disable-profile-sync'] )
</del><ins>+ if ( (int)$bp->site_options['bp-disable-profile-sync'] )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
</span></span></pre>
</div>
</div>
</body>
</html>