| @@ -414,9 +414,9 @@ | ||
| 414 | 414 | array( |
| 415 | 415 | 'item_id' => $entry->id, |
| 416 | 416 | 'field_id !' => 0, |
| 417 | 417 | ), |
| 418 | - 'field_id, meta_value, field_key, item_id, f.type' | |
| 418 | + 'field_id, meta_value, field_key, item_id' | |
| 419 | 419 | ); |
| 420 | 420 | |
| 421 | 421 | $entry->metas = array(); |
| 422 | 422 | |
| @@ -421,11 +421,10 @@ | ||
| 421 | 421 | $entry->metas = array(); |
| 422 | 422 | |
| 423 | 423 | $include_key = apply_filters( 'frm_include_meta_keys', false, array( 'form_id' => $entry->form_id ) ); |
| 424 | 424 | foreach ( $metas as $meta_val ) { |
| 425 | - FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type ); | |
| 426 | - | |
| 427 | 425 | if ( $meta_val->item_id == $entry->id ) { |
| 426 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 428 | 427 | $entry->metas[ $meta_val->field_id ] = $meta_val->meta_value; |
| 429 | 428 | if ( $include_key ) { |
| 430 | 429 | $entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ]; |
| 431 | 430 | } |
| @@ -436,8 +435,9 @@ | ||
| 436 | 435 | if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) { |
| 437 | 436 | $entry->metas[ $meta_val->field_id ] = array(); |
| 438 | 437 | } |
| 439 | 438 | |
| 439 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 440 | 440 | $entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value; |
| 441 | 441 | |
| 442 | 442 | unset( $meta_val ); |
| 443 | 443 | } |
| @@ -517,13 +517,9 @@ | ||
| 517 | 517 | } else { |
| 518 | 518 | $meta_where['item_id'] = array_keys( $entries ); |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - $metas = FrmDb::get_results( | |
| 522 | - $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id = fi.id', | |
| 523 | - $meta_where, | |
| 524 | - 'item_id, meta_value, field_id, field_key, form_id, fi.type' | |
| 525 | - ); | |
| 521 | + $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' ); | |
| 526 | 522 | |
| 527 | 523 | unset( $meta_where ); |
| 528 | 524 | |
| 529 | 525 | if ( ! $metas ) { |
| @@ -539,9 +535,9 @@ | ||
| 539 | 535 | if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) { |
| 540 | 536 | $entries[ $meta_val->item_id ]->metas = array(); |
| 541 | 537 | } |
| 542 | 538 | |
| 543 | - FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type ); | |
| 539 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 544 | 540 | $entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value; |
| 545 | 541 | unset( $m_key, $meta_val ); |
| 546 | 542 | } |
| 547 | 543 | |
