Skip to content

Commit

Permalink
fix problems with merging last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
thraxisp committed Dec 31, 2008
1 parent 61a03a3 commit cb54347
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bug_report.php
Expand Up @@ -102,7 +102,7 @@
error_parameters( lang_get_defaulted( custom_field_get_field( $t_id, 'name' ) ) );
trigger_error( ERROR_EMPTY_FIELD, ERROR );
}
if ( !custom_field_validate( $t_id, $t_cf_value ) ) {
if ( !custom_field_validate( $t_id, gpc_get_custom_field( "custom_field_$t_id", $t_def['type'], NULL ) ) ) {
error_parameters( lang_get_defaulted( custom_field_get_field( $t_id, 'name' ) ) );
trigger_error( ERROR_CUSTOM_FIELD_INVALID_VALUE, ERROR );
}
Expand Down
2 changes: 1 addition & 1 deletion bug_update.php
Expand Up @@ -142,7 +142,7 @@
continue;
}

if ( !custom_field_set_value( $t_id, $f_bug_id, $t_cf_value ) ) {
if ( !custom_field_set_value( $t_id, $f_bug_id, gpc_get_custom_field( "custom_field_$t_id", $t_def['type'], NULL ) ) ) {
error_parameters( lang_get_defaulted( custom_field_get_field( $t_id, 'name' ) ) );
trigger_error( ERROR_CUSTOM_FIELD_INVALID_VALUE, ERROR );
}
Expand Down

0 comments on commit cb54347

Please sign in to comment.