<!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] [2059] trunk: Merging 1.1 branch updates with trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2059</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-10-26 19:03:25 +0000 (Mon, 26 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merging 1.1 branch updates with trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoresettingsphp">trunk/bp-core/bp-core-settings.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatetagsphp">trunk/bp-xprofile/bp-xprofile-templatetags.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-settings.php (2058 => 2059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-settings.php 2009-10-26 18:41:07 UTC (rev 2058)
+++ trunk/bp-core/bp-core-settings.php 2009-10-26 19:03:25 UTC (rev 2059)
</span><span class="lines">@@ -153,47 +153,15 @@
</span><span class="cx">
</span><span class="cx"> /**** DELETE ACCOUNT ****/
</span><span class="cx">
</span><del>-function bp_core_screen_delete_account() {
- global $current_user, $bp_settings_updated, $pass_error;
-
- if ( isset( $_POST['delete-account-button'] ) ) {
</del><ins>+function bp_core_screen_delete_account() {
+ if ( isset( $_POST['delete-account-understand'] ) ) {
</ins><span class="cx"> check_admin_referer( 'delete-account' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // delete the users account
</span><span class="cx"> if ( bp_core_delete_account() )
</span><span class="cx"> bp_core_redirect( site_url() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $bp_settings_updated = false;
- $pass_error = false;
-
- if ( isset($_POST['submit']) ) {
- check_admin_referer('bp_settings_general');
-
- require_once( WPINC . '/registration.php' );
-
- // Form has been submitted and nonce checks out, lets do it.
-
- if ( $_POST['email'] != '' ) {
- $current_user->user_email = wp_specialchars( trim( $_POST['email'] ));
- }
-
- if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
- if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) ) {
- $current_user->user_pass = $_POST['pass1'];
- } else {
- $pass_error = true;
- }
- } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
- $pass_error = true;
- } else {
- unset( $current_user->user_pass );
- }
-
- if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
- $bp_settings_updated = true;
- }
-
</del><span class="cx"> add_action( 'bp_template_title', 'bp_core_screen_delete_account_title' );
</span><span class="cx"> add_action( 'bp_template_content', 'bp_core_screen_delete_account_content' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2058 => 2059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2009-10-26 18:41:07 UTC (rev 2058)
+++ trunk/bp-core.php 2009-10-26 19:03:25 UTC (rev 2059)
</span><span class="lines">@@ -1545,7 +1545,7 @@
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><span class="cx"> /* Make sure account deletion is not disabled */
</span><del>- if ( ( !(int) get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
</del><ins>+ if ( ( '' != get_site_option( 'bp-disable-account-deletion' ) || (int) get_site_option( 'bp-disable-account-deletion' ) ) && !is_site_admin() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Site admins should not be allowed to be deleted */
</span><span class="lines">@@ -1715,7 +1715,26 @@
</span><span class="cx"> return $hookname;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_core_boot_spammer()
+ *
+ * When a user logs in, check if they have been marked as a spammer. If then simply
+ * redirect them to the home page and stop them from logging in.
+ *
+ * @package BuddyPress Core
+ * @param $username The username of the user
+ * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ */
+function bp_core_boot_spammer( $auth_obj, $username ) {
+ global $bp;
+
+ $user = get_userdatabylogin( $username );
</ins><span class="cx">
</span><ins>+ if ( (int)$user->spam )
+ bp_core_redirect( $bp->root_domain );
+}
+add_filter( 'authenticate', 'bp_core_boot_spammer', 11, 2 );
+
</ins><span class="cx"> /**
</span><span class="cx"> * bp_core_remove_data()
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-templatetags.php (2058 => 2059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-templatetags.php 2009-10-26 18:41:07 UTC (rev 2058)
+++ trunk/bp-xprofile/bp-xprofile-templatetags.php 2009-10-26 19:03:25 UTC (rev 2059)
</span><span class="lines">@@ -469,8 +469,8 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'datebox':
</span><del>-
- if ( $field->data->value != '' ) {
</del><ins>+
+ if ( !empty( $field->data->value ) ) {
</ins><span class="cx"> $day = date("j", $field->data->value);
</span><span class="cx"> $month = date("F", $field->data->value);
</span><span class="cx"> $year = date("Y", $field->data->value);
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2058 => 2059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2009-10-26 18:41:07 UTC (rev 2058)
+++ trunk/bp-xprofile.php 2009-10-26 19:03:25 UTC (rev 2059)
</span><span class="lines">@@ -327,25 +327,25 @@
</span><span class="cx">
</span><span class="cx"> /* Loop through the posted fields formatting any datebox values then validate the field */
</span><span class="cx"> foreach ( $posted_field_ids as $field_id ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !isset( $_POST['field_' . $field_id] ) ) {
</span><del>-
- if ( isset( $_POST['field_' . $field_id . '_day'] ) ) {
</del><ins>+
+ if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
</ins><span class="cx"> /* Concatenate the values. */
</span><span class="cx"> $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .
</span><span class="cx"> $_POST['field_' . $field_id . '_month'] . ' ' .
</span><span class="cx"> $_POST['field_' . $field_id . '_year'];
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Turn the concatenated value into a timestamp */
</span><span class="cx"> $_POST['field_' . $field_id] = strtotime( $date_value );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
</span><span class="cx"> $errors = true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $errors )
</span><span class="cx"> bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>