<!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] [3218] branches/1.2: Fixes #2580 props sorich87</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3218</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-25 17:34:58 +0000 (Wed, 25 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2580 props sorich87</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="#branches12bpforumsbpforumsbbpressphp">branches/1.2/bp-forums/bp-forums-bbpress.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="#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 (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-activity.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> KEY meta_key (meta_key)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> update_site_option( 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
</span></span></pre></div>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-blogs.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><span class="cx">
</span><del>- require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
</ins><span class="cx">
</span><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-core.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> KEY useritem (user_id,is_new)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx"> dbDelta( $sql );
</span><span class="cx">
</span><span class="cx"> /* Add names of root components to the banned blog list to avoid conflicts */
</span></span></pre></div>
<a id="branches12bpforumsbpforumsbbpressphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums/bp-forums-bbpress.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums/bp-forums-bbpress.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-forums/bp-forums-bbpress.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> /* This must be loaded before functionss.bb-admin.php otherwise we get a function conflict. */
</span><span class="cx"> if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
</span><del>- require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx">
</span><span class="cx"> require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-friends.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> KEY friend_user_id (friend_user_id)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
</ins><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> update_site_option( 'bp-friends-db-version', BP_FRIENDS_DB_VERSION );
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-groups.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> KEY meta_key (meta_key)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
</ins><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_install' );
</span></span></pre></div>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-messages.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> KEY is_active (is_active)
</span><span class="cx"> ) {$charset_collate};";
</span><span class="cx">
</span><del>- require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> /* Upgrade and remove the message threads table if it exists */
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (3217 => 3218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2010-08-25 13:13:44 UTC (rev 3217)
+++ branches/1.2/bp-xprofile.php 2010-08-25 17:34:58 UTC (rev 3218)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> do_action( 'xprofile_install' );
</span></span></pre>
</div>
</div>
</body>
</html>