<!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] [2066] trunk/bp-xprofile: Fixes #1221 props DJPaul</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2066</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2009-11-01 01:12:02 +0000 (Sun, 01 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #1221 props DJPaul</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>
<li><a href="#trunkbpxprofilebpxprofiletemplatetagsphp">trunk/bp-xprofile/bp-xprofile-templatetags.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 (2065 => 2066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php        2009-11-01 01:05:01 UTC (rev 2065)
+++ trunk/bp-xprofile/bp-xprofile-admin.php        2009-11-01 01:12:02 UTC (rev 2066)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">                                                         
</span><span class="cx">                                                                         &lt;tr id=&quot;field_&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&quot; class=&quot;sortable&lt;?php if ( $class ) { echo ' ' . $class; } ?&gt;&quot;&gt;
</span><span class="cx">                                                                             &lt;td width=&quot;10&quot;&gt;&lt;img src=&quot;&lt;?php echo BP_PLUGIN_URL ?&gt;/bp-xprofile/admin/images/move.gif&quot; alt=&quot;&lt;?php _e( 'Drag', 'buddypress' ) ?&gt;&quot; /&gt;&lt;/td&gt;
</span><del>-                                                                                &lt;td&gt;&lt;span title=&quot;&lt;?php echo $field-&gt;desc; ?&gt;&quot;&gt;&lt;?php echo attribute_escape( $field-&gt;name ); ?&gt; &lt;?php if(!$field-&gt;can_delete) { ?&gt; &lt;?php _e( '(Core Field)', 'buddypress' ) ?&gt;&lt;?php } ?&gt;&lt;/span&gt;&lt;/td&gt;
</del><ins>+                                                                                &lt;td&gt;&lt;span title=&quot;&lt;?php echo $field-&gt;description; ?&gt;&quot;&gt;&lt;?php echo attribute_escape( $field-&gt;name ); ?&gt; &lt;?php if(!$field-&gt;can_delete) { ?&gt; &lt;?php _e( '(Core Field)', 'buddypress' ) ?&gt;&lt;?php } ?&gt;&lt;/span&gt;&lt;/td&gt;
</ins><span class="cx">                                                                             &lt;td&gt;&lt;?php echo attribute_escape( $field-&gt;type ); ?&gt;&lt;/td&gt;
</span><span class="cx">                                                                             &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( $field-&gt;is_required ) { echo '&lt;img src=&quot;' . BP_PLUGIN_URL . '/bp-xprofile/admin/images/tick.gif&quot; alt=&quot;' . __( 'Yes', 'buddypress' ) . '&quot; /&gt;'; } else { ?&gt;--&lt;?php } ?&gt;&lt;/td&gt;
</span><span class="cx">                                                                             &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( !$field-&gt;can_delete ) { ?&gt;&lt;strike&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/strike&gt;&lt;?php } else { ?&gt;&lt;a class=&quot;edit&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&amp;amp;field_id=&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&amp;amp;mode=edit_field&quot;&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/td&gt;
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">         if ( isset($_POST['saveField']) ) {
</span><span class="cx">                 if ( BP_XProfile_Field::admin_validate() ) {
</span><span class="cx">                         $field-&gt;name = wp_filter_kses( $_POST['title'] );
</span><del>-                        $field-&gt;desc = wp_filter_kses( $_POST['description'] );
</del><ins>+                        $field-&gt;description = wp_filter_kses( $_POST['description'] );
</ins><span class="cx">                         $field-&gt;is_required = wp_filter_kses( $_POST['required'] );
</span><span class="cx">                         $field-&gt;type = wp_filter_kses( $_POST['fieldtype'] );
</span><span class="cx">                         $field-&gt;order_by = wp_filter_kses( $_POST[&quot;sort_order_{$field-&gt;type}&quot;] );
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (2065 => 2066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php        2009-11-01 01:05:01 UTC (rev 2065)
+++ trunk/bp-xprofile/bp-xprofile-classes.php        2009-11-01 01:12:02 UTC (rev 2066)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">         var $parent_id;
</span><span class="cx">         var $type;
</span><span class="cx">         var $name;
</span><del>-        var $desc;
</del><ins>+        var $description;
</ins><span class="cx">         var $is_required;
</span><span class="cx">         var $can_delete;
</span><span class="cx">         var $field_order;
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">                 $this-&gt;parent_id = apply_filters( 'xprofile_field_parent_id_before_save', $this-&gt;parent_id, $this-&gt;id );
</span><span class="cx">                 $this-&gt;type = apply_filters( 'xprofile_field_type_before_save', $this-&gt;type, $this-&gt;id );
</span><span class="cx">                 $this-&gt;name = apply_filters( 'xprofile_field_name_before_save', $this-&gt;name, $this-&gt;id );
</span><del>-                $this-&gt;desc = apply_filters( 'xprofile_field_description_before_save', $this-&gt;desc, $this-&gt;id );
</del><ins>+                $this-&gt;description = apply_filters( 'xprofile_field_description_before_save', $this-&gt;description, $this-&gt;id );
</ins><span class="cx">                 $this-&gt;is_required = apply_filters( 'xprofile_field_is_required_before_save', $this-&gt;is_required, $this-&gt;id );
</span><span class="cx">                 $this-&gt;order_by = apply_filters( 'xprofile_field_order_by_before_save', $this-&gt;order_by, $this-&gt;id );
</span><span class="cx">                 $this-&gt;field_order = apply_filters( 'xprofile_field_field_order_before_save', $this-&gt;field_order, $this-&gt;id );
</span><span class="lines">@@ -264,9 +264,9 @@
</span><span class="cx">                 do_action( 'xprofile_field_before_save', $this );
</span><span class="cx">                 
</span><span class="cx">                 if ( $this-&gt;id != null )
</span><del>-                        $sql = $wpdb-&gt;prepare(&quot;UPDATE {$bp-&gt;profile-&gt;table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d WHERE id = %d&quot;, $this-&gt;group_id, $this-&gt;type, $this-&gt;name, $this-&gt;desc, $this-&gt;is_required, $this-&gt;order_by, $this-&gt;field_order, $this-&gt;id);
</del><ins>+                        $sql = $wpdb-&gt;prepare(&quot;UPDATE {$bp-&gt;profile-&gt;table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d WHERE id = %d&quot;, $this-&gt;group_id, $this-&gt;type, $this-&gt;name, $this-&gt;description, $this-&gt;is_required, $this-&gt;order_by, $this-&gt;field_order, $this-&gt;id);
</ins><span class="cx">                 else
</span><del>-                        $sql = $wpdb-&gt;prepare(&quot;INSERT INTO {$bp-&gt;profile-&gt;table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order ) VALUES (%d, 0, %s, %s, %s, %d, %s, %d )&quot;, $this-&gt;group_id, $this-&gt;type, $this-&gt;name, $this-&gt;desc, $this-&gt;is_required, $this-&gt;order_by, $this-&gt;field_order );
</del><ins>+                        $sql = $wpdb-&gt;prepare(&quot;INSERT INTO {$bp-&gt;profile-&gt;table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order ) VALUES (%d, 0, %s, %s, %s, %d, %s, %d )&quot;, $this-&gt;group_id, $this-&gt;type, $this-&gt;name, $this-&gt;description, $this-&gt;is_required, $this-&gt;order_by, $this-&gt;field_order );
</ins><span class="cx"> 
</span><span class="cx">                 // Check for null so field options can be changed without changing any other part of the field.
</span><span class="cx">                 // The described situation will return 0 here.
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx">                         $action = &quot;admin.php?page=bp-profile-setup&amp;amp;group_id=&quot; . $this-&gt;group_id . &quot;&amp;amp;mode=add_field&quot;;
</span><span class="cx"> 
</span><span class="cx">                         $this-&gt;name                        = $_POST['title'];
</span><del>-                        $this-&gt;desc                        = $_POST['description'];
</del><ins>+                        $this-&gt;description        = $_POST['description'];
</ins><span class="cx">                         $this-&gt;is_required        = $_POST['required'];
</span><span class="cx">                         $this-&gt;type                        = $_POST['fieldtype'];
</span><span class="cx">                         $this-&gt;order_by                = $_POST[&quot;sort_order_{$this-&gt;type}&quot;];
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">                                 &lt;div id=&quot;titlediv&quot; class=&quot;inside&quot;&gt;
</span><span class="cx">                                         &lt;h3&gt;&lt;label for=&quot;description&quot;&gt;&lt;?php _e(&quot;Field Description&quot;, 'buddypress') ?&gt;&lt;/label&gt;&lt;/h3&gt;
</span><span class="cx">                                         &lt;div id=&quot;titlewrap&quot;&gt;
</span><del>-                                                &lt;textarea name=&quot;description&quot; id=&quot;description&quot; rows=&quot;8&quot; cols=&quot;60&quot;&gt;&lt;?php echo htmlspecialchars( $this-&gt;desc ); ?&gt;&lt;/textarea&gt;
</del><ins>+                                                &lt;textarea name=&quot;description&quot; id=&quot;description&quot; rows=&quot;8&quot; cols=&quot;60&quot;&gt;&lt;?php echo htmlspecialchars( $this-&gt;description ); ?&gt;&lt;/textarea&gt;
</ins><span class="cx">                                         &lt;/div&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-templatetags.php (2065 => 2066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-templatetags.php        2009-11-01 01:05:01 UTC (rev 2065)
+++ trunk/bp-xprofile/bp-xprofile-templatetags.php        2009-11-01 01:12:02 UTC (rev 2066)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx">         function bp_get_the_profile_field_description() {
</span><span class="cx">                 global $field;
</span><span class="cx">                 
</span><del>-                return apply_filters( 'bp_get_the_profile_field_description', $field-&gt;desc );
</del><ins>+                return apply_filters( 'bp_get_the_profile_field_description', $field-&gt;description );
</ins><span class="cx">         }
</span><span class="cx">         
</span><span class="cx"> function bp_the_profile_field_input_name() {
</span></span></pre>
</div>
</div>

</body>
</html>