Skip to:
Content

BuddyPress.org

Changeset 2066


Ignore:
Timestamp:
11/01/2009 01:12:02 AM (15 years ago)
Author:
johnjamesjacoby
Message:

Fixes #1221 props DJPaul

Location:
trunk/bp-xprofile
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-xprofile/bp-xprofile-admin.php

    r1969 r2066  
    9090                                    <tr id="field_<?php echo attribute_escape( $field->id ); ?>" class="sortable<?php if ( $class ) { echo ' ' . $class; } ?>">
    9191                                        <td width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></td>
    92                                         <td><span title="<?php echo $field->desc; ?>"><?php echo attribute_escape( $field->name ); ?> <?php if(!$field->can_delete) { ?> <?php _e( '(Core Field)', 'buddypress' ) ?><?php } ?></span></td>
     92                                        <td><span title="<?php echo $field->description; ?>"><?php echo attribute_escape( $field->name ); ?> <?php if(!$field->can_delete) { ?> <?php _e( '(Core Field)', 'buddypress' ) ?><?php } ?></span></td>
    9393                                        <td><?php echo attribute_escape( $field->type ); ?></td>
    9494                                        <td style="text-align:center;"><?php if ( $field->is_required ) { echo '<img src="' . BP_PLUGIN_URL . '/bp-xprofile/admin/images/tick.gif" alt="' . __( 'Yes', 'buddypress' ) . '" />'; } else { ?>--<?php } ?></td>
     
    217217        if ( BP_XProfile_Field::admin_validate() ) {
    218218            $field->name = wp_filter_kses( $_POST['title'] );
    219             $field->desc = wp_filter_kses( $_POST['description'] );
     219            $field->description = wp_filter_kses( $_POST['description'] );
    220220            $field->is_required = wp_filter_kses( $_POST['required'] );
    221221            $field->type = wp_filter_kses( $_POST['fieldtype'] );
  • trunk/bp-xprofile/bp-xprofile-classes.php

    r2025 r2066  
    182182    var $type;
    183183    var $name;
    184     var $desc;
     184    var $description;
    185185    var $is_required;
    186186    var $can_delete;
     
    257257        $this->type = apply_filters( 'xprofile_field_type_before_save', $this->type, $this->id );
    258258        $this->name = apply_filters( 'xprofile_field_name_before_save', $this->name, $this->id );
    259         $this->desc = apply_filters( 'xprofile_field_description_before_save', $this->desc, $this->id );
     259        $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
    260260        $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
    261261        $this->order_by = apply_filters( 'xprofile_field_order_by_before_save', $this->order_by, $this->id );
     
    265265       
    266266        if ( $this->id != null )
    267             $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);
     267            $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);
    268268        else
    269             $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 );
     269            $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 );
    270270
    271271        // Check for null so field options can be changed without changing any other part of the field.
     
    520520
    521521            $this->name         = $_POST['title'];
    522             $this->desc         = $_POST['description'];
     522            $this->description  = $_POST['description'];
    523523            $this->is_required  = $_POST['required'];
    524524            $this->type         = $_POST['fieldtype'];
     
    555555                    <h3><label for="description"><?php _e("Field Description", 'buddypress') ?></label></h3>
    556556                    <div id="titlewrap">
    557                         <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->desc ); ?></textarea>
     557                        <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
    558558                    </div>
    559559                </div>
  • trunk/bp-xprofile/bp-xprofile-templatetags.php

    r2059 r2066  
    369369        global $field;
    370370       
    371         return apply_filters( 'bp_get_the_profile_field_description', $field->desc );
     371        return apply_filters( 'bp_get_the_profile_field_description', $field->description );
    372372    }
    373373   
Note: See TracChangeset for help on using the changeset viewer.