<!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][5598] trunk/bp-xprofile: When deleting a field, do not delete the field data by default.</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, #logmsg > ol { margin-left: 0; 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/5598">5598</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-12-24 18:01:22 +0000 (Sat, 24 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>When deleting a field, do not delete the field data by default. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3888">#3888</a>. In memory of jimgroom's lost data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (5597 => 5598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2011-12-24 16:31:07 UTC (rev 5597)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2011-12-24 18:01:22 UTC (rev 5598)
</span><span class="lines">@@ -312,27 +312,31 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**************************************************************************
- xprofile_admin_delete_field()
-
- Handles the deletion of a profile field [or option].
-**************************************************************************/
-function xprofile_admin_delete_field( $field_id, $type = 'field' ) {
</del><ins>+/**
+ * Handles the deletion of a profile field (or field option)
+ *
+ * @since BuddyPress (1.0)
+ * @global string $message The feedback message to show
+ * @global $type The type of feedback message to show
+ * @param int $field_id The field to delete
+ * @param string $field_type The type of field being deleted
+ * @param bool $delete_data Should the field data be deleted too?
+ */
+function xprofile_admin_delete_field( $field_id, $field_type = 'field', $delete_data = false ) {
</ins><span class="cx"> global $message, $type;
</span><span class="cx">
</span><del>- if ( 'field' == $type )
- $type = __('field', 'buddypress');
- else
- $type = __('option', 'buddypress');
</del><ins>+ // Switch type to 'option' if type is not 'field'
+ // @todo trust this param
+ $field_type = ( 'field' == $field_type ) ? __( 'field', 'buddypress' ) : __( 'option', 'buddypress' );
</ins><span class="cx">
</span><span class="cx"> $field = new BP_XProfile_Field( $field_id );
</span><span class="cx">
</span><del>- if ( !$field->delete() ) {
- $message = sprintf( __('There was an error deleting the %s. Please try again', 'buddypress' ), $type );
- $type = 'error';
</del><ins>+ if ( !$field->delete( (bool) $delete_data ) ) {
+ $message = sprintf( __( 'There was an error deleting the %s. Please try again', 'buddypress' ), $field_type );
+ $type = 'error';
</ins><span class="cx"> } else {
</span><del>- $message = sprintf( __('The %s was deleted successfully!', 'buddypress' ), $type );
- $type = 'success';
</del><ins>+ $message = sprintf( __( 'The %s was deleted successfully!', 'buddypress' ), $field_type );
+ $type = 'success';
</ins><span class="cx">
</span><span class="cx"> do_action( 'xprofile_fields_deleted_field', $field );
</span><span class="cx"> }
</span><span class="lines">@@ -459,10 +463,6 @@
</span><span class="cx"> <?php do_action( 'xprofile_admin_field', $field, 1 ); ?>
</span><span class="cx">
</span><span class="cx"> <?php } ?>
</span><del>- <div class="actions">
- <?php if ( !$field->can_delete ) : ?>&nbsp;<?php else : ?><a class="submit-delete deletion ajax-option-delete" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a><?php endif; ?>
- <a class="button edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
- </div>
</del><span class="cx">
</span><span class="cx"> <?php if ( $field->description ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -470,6 +470,15 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <div class="actions">
+ <a class="button edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
+
+ <?php if ( $field->can_delete ) : ?>
+
+ <a class="submit-delete deletion" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
+
+ <?php endif; ?>
+ </div>
</ins><span class="cx"> </div>
</span><span class="cx"> </fieldset>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (5597 => 5598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2011-12-24 16:31:07 UTC (rev 5597)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2011-12-24 18:01:22 UTC (rev 5598)
</span><span class="lines">@@ -373,21 +373,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete() {
</del><ins>+ function delete( $delete_data = false ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !$this->id ||
- /* Prevent deletion by url when can_delete is false. */
- !$this->can_delete ||
- /* Prevent deletion of option 1 since this invalidates fields with options. */
- ( $this->parent_id && $this->option_order == 1 ) )
</del><ins>+ // Prevent deletion if no ID is present
+ // Prevent deletion by url when can_delete is false.
+ // Prevent deletion of option 1 since this invalidates fields with options.
+ if ( !$this->id || !$this->can_delete || ( $this->parent_id && $this->option_order == 1 ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* delete the data in the DB for this field */
- BP_XProfile_ProfileData::delete_for_field( $this->id );
</del><ins>+ // delete the data in the DB for this field
+ if ( true === $delete_data )
+ BP_XProfile_ProfileData::delete_for_field( $this->id );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>