<!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" />
<title>[BuddyPress][8195] trunk: Clean up bp_update_to_2_0() and BP_Members_Admin class</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8195">8195</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-03-28 23:47:39 +0000 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up bp_update_to_2_0() and BP_Members_Admin class
Improve code formatting
props johnjamesjacoby
See <a href="http://buddypress.trac.wordpress.org/ticket/5374">#5374</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreupdatephp">trunk/bp-core/bp-core-update.php</a></li>
<li><a href="#trunkbpmembersbpmembersadminphp">trunk/bp-members/bp-members-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-update.php (8194 => 8195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-update.php 2014-03-28 23:35:24 UTC (rev 8194)
+++ trunk/bp-core/bp-core-update.php 2014-03-28 23:47:39 UTC (rev 8195)
</span><span class="lines">@@ -342,14 +342,15 @@
</span><span class="cx"> function bp_update_to_2_0() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- /** Install activity tables for 'last_activity' **********************/
</del><ins>+ /** Install activity tables for 'last_activity' ***************************/
+
</ins><span class="cx"> bp_core_install_activity_streams();
</span><span class="cx">
</span><del>- /** Migrate 'last_activity' data *************************************/
</del><ins>+ /** Migrate 'last_activity' data ******************************************/
</ins><span class="cx">
</span><span class="cx"> bp_last_activity_migrate();
</span><span class="cx">
</span><del>- /** Migrate signups data *********************************************/
</del><ins>+ /** Migrate signups data **************************************************/
</ins><span class="cx">
</span><span class="cx"> if ( bp_get_signup_allowed() && ! is_multisite() ) {
</span><span class="cx">
</span><span class="lines">@@ -379,23 +380,22 @@
</span><span class="cx"> $user_login = preg_replace( '/\s+/', '', sanitize_user( $signup->user_login, true ) );
</span><span class="cx"> $user_email = sanitize_email( $signup->user_email );
</span><span class="cx">
</span><del>- $args = array(
</del><ins>+ BP_Signup::add( array(
</ins><span class="cx"> 'user_login' => $user_login,
</span><span class="cx"> 'user_email' => $user_email,
</span><span class="cx"> 'registered' => $signup->user_registered,
</span><span class="cx"> 'activation_key' => $signup->activation_key,
</span><span class="cx"> 'meta' => $meta
</span><del>- );
</del><ins>+ ) );
</ins><span class="cx">
</span><del>- BP_Signup::add( $args );
-
</del><span class="cx"> // Deleting these options will remove signups from users count
</span><span class="cx"> delete_user_option( $signup->ID, 'capabilities' );
</span><del>- delete_user_option( $signup->ID, 'user_level' );
</del><ins>+ delete_user_option( $signup->ID, 'user_level' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /** Add BP options to the options table ******************************/
</del><ins>+ /** Add BP options to the options table ***********************************/
+
</ins><span class="cx"> bp_add_options();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-admin.php (8194 => 8195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-admin.php 2014-03-28 23:35:24 UTC (rev 8194)
+++ trunk/bp-members/bp-members-admin.php 2014-03-28 23:47:39 UTC (rev 8195)
</span><span class="lines">@@ -166,9 +166,9 @@
</span><span class="cx"> if ( ! is_multisite() ) {
</span><span class="cx"> add_action( 'pre_user_query', array( $this, 'remove_signups_from_user_query'), 10, 1 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ // Reorganise the views navigation in users.php and signups page
</ins><span class="cx"> if ( current_user_can( $this->capability ) ) {
</span><del>- // Reorganise the views navigation in users.php and signups page
</del><span class="cx"> add_filter( "views_{$this->users_screen}", array( $this, 'signup_filter_view' ), 10, 1 );
</span><span class="cx"> add_filter( 'set-screen-option', array( $this, 'signup_screen_options' ), 10, 3 );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>