| @@ -476,14 +476,9 @@ | ||
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) { |
| 479 | 479 | if ( ! isset( $metas[ $repeater_child->id ] ) ) { |
| 480 | - $metas[ $repeater_child->id ] = ''; | |
| 481 | - | |
| 482 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) { | |
| 483 | - $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array(); | |
| 484 | - } | |
| 485 | - | |
| 480 | + $metas[ $repeater_child->id ] = ''; | |
| 486 | 481 | $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = ''; |
| 487 | 482 | } |
| 488 | 483 | } |
| 489 | 484 | |
| @@ -503,9 +498,9 @@ | ||
| 503 | 498 | private static function add_field_values_to_csv( &$row ) { |
| 504 | 499 | foreach ( self::$fields as $col ) { |
| 505 | 500 | $field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false; |
| 506 | 501 | |
| 507 | - FrmFieldsHelper::prepare_field_value( $field_value, $col->type ); | |
| 502 | + FrmAppHelper::unserialize_or_decode( $field_value ); | |
| 508 | 503 | self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) ); |
| 509 | 504 | |
| 510 | 505 | $field_value = apply_filters( |
| 511 | 506 | 'frm_csv_value', |
| @@ -521,13 +516,10 @@ | ||
| 521 | 516 | if ( ! empty( $col->field_options['separate_value'] ) ) { |
| 522 | 517 | $label_key = $col->id . '_label'; |
| 523 | 518 | if ( self::is_the_child_of_a_repeater( $col ) ) { |
| 524 | 519 | $row[ $label_key ] = array(); |
| 525 | - | |
| 526 | - if ( is_array( $field_value ) ) { | |
| 527 | - foreach ( $field_value as $value ) { | |
| 528 | - $row[ $label_key ][] = self::get_separate_value_label( $value, $col ); | |
| 529 | - } | |
| 520 | + foreach ( $field_value as $value ) { | |
| 521 | + $row[ $label_key ][] = self::get_separate_value_label( $value, $col ); | |
| 530 | 522 | } |
| 531 | 523 | } else { |
| 532 | 524 | $row[ $label_key ] = self::get_separate_value_label( $field_value, $col ); |
| 533 | 525 | } |
