<!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] [3010] branches/1.2/bp-core.php: Fixes #2373 props mattwiebe</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3010</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-05-19 00:57:24 +0000 (Wed, 19 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2373 props mattwiebe</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3009 => 3010)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-05-17 13:13:17 UTC (rev 3009)
+++ branches/1.2/bp-core.php 2010-05-19 00:57:24 UTC (rev 3010)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</span><span class="cx"> */
</span><span class="cx"> function bp_core_action_set_spammer_status() {
</span><del>- global $bp, $wpdb;
</del><ins>+ global $bp, $wpdb, $wp_version;
</ins><span class="cx">
</span><span class="cx"> if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
</span><span class="cx"> return false;
</span><span class="lines">@@ -424,8 +424,12 @@
</span><span class="cx"> check_admin_referer( 'mark-unmark-spammer' );
</span><span class="cx">
</span><span class="cx"> /* Get the functions file */
</span><del>- if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multisite() )
- require( ABSPATH . 'wp-admin/includes/mu.php' );
</del><ins>+ if ( bp_core_is_multisite() ) {
+ if ( $wp_version >= '3.0' )
+ require_once( ABSPATH . '/wp-admin/includes/ms.php' );
+ else
+ require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( 'mark-spammer' == $bp->current_action )
</span><span class="cx"> $is_spam = 1;
</span><span class="lines">@@ -1699,7 +1703,7 @@
</span><span class="cx"> * @uses get_site_option Checks if account deletion is allowed
</span><span class="cx"> */
</span><span class="cx"> function bp_core_delete_account( $user_id = false ) {
</span><del>- global $bp, $wpdb;
</del><ins>+ global $bp, $wpdb, $wp_version;
</ins><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="lines">@@ -1714,7 +1718,11 @@
</span><span class="cx"> if ( is_site_admin( bp_core_get_username( $user_id ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- require_once( ABSPATH . '/wp-admin/includes/mu.php' );
</del><ins>+ if ( $wp_version >= '3.0' )
+ require_once( ABSPATH . '/wp-admin/includes/ms.php' );
+ else
+ require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+
</ins><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/user.php' );
</span><span class="cx">
</span><span class="cx"> return wpmu_delete_user( $user_id );
</span></span></pre>
</div>
</div>
</body>
</html>