Changeset 2075 for branches/1.1/bp-xprofile/bp-xprofile-classes.php

Timestamp:

11/02/2009 06:26:55 PM (17 years ago)

Author:

apeatling

Message:

Applying jjj trunk fixes to 1.1 branch.

File:

• branches/1.1/bp-xprofile/bp-xprofile-classes.php (modified) (6 diffs)

branches/1.1/bp-xprofile/bp-xprofile-classes.php

@@ -182 +182 @@
         var $type;
         var $name;
-        var $desc;
+        var $description;
         var $is_required;
         var $can_delete;
@@ -215 +215 @@
                         $this->type = $field->type;
                         $this->name = stripslashes($field->name);
-                        $this->desc = stripslashes($field->description);
+                        $this->description = stripslashes($field->description);
                         $this->is_required = $field->is_required;
                         $this->can_delete = $field->can_delete;
@@ -257 +257 @@
                 $this->type = apply_filters( 'xprofile_field_type_before_save', $this->type, $this->id );
                 $this->name = apply_filters( 'xprofile_field_name_before_save', $this->name, $this->id );
-                $this->desc = apply_filters( 'xprofile_field_description_before_save', $this->desc, $this->id );
+                $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
                 $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
                 $this->order_by = apply_filters( 'xprofile_field_order_by_before_save', $this->order_by, $this->id );
@@ -265 +265 @@
                 
                 if ( $this->id != null )
-                        $sql = $wpdb->prepare("UPDATE {$bp->profile->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", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->order_by, $this->field_order, $this->id);
+                        $sql = $wpdb->prepare("UPDATE {$bp->profile->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", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->id);
                 else
-                        $sql = $wpdb->prepare("INSERT INTO {$bp->profile->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 )", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->order_by, $this->field_order );
+                        $sql = $wpdb->prepare("INSERT INTO {$bp->profile->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 )", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order );
 
                 // Check for null so field options can be changed without changing any other part of the field.
@@ -520 +520 @@
 
                         $this->name                     = $_POST['title'];
-                        $this->desc                     = $_POST['description'];
+                        $this->description      = $_POST['description'];
                         $this->is_required      = $_POST['required'];
                         $this->type                     = $_POST['fieldtype'];
@@ -555 +555 @@
                                         <h3><label for="description"><?php _e("Field Description", 'buddypress') ?></label></h3>
                                         <div id="titlewrap">
-                                                <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->desc ); ?></textarea>
+                                                <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
                                         </div>
                                 </div>