| @@ -33,12 +33,8 @@ | ||
| 33 | 33 | $field_array['original_default'] = $original_default; |
| 34 | 34 | |
| 35 | 35 | FrmFieldsHelper::prepare_new_front_field( $field_array, $field, $args ); |
| 36 | 36 | |
| 37 | - if ( ! is_array( $field->field_options ) ) { | |
| 38 | - $field->field_options = array(); | |
| 39 | - } | |
| 40 | - | |
| 41 | 37 | $field_array = array_merge( $field->field_options, $field_array ); |
| 42 | 38 | |
| 43 | 39 | $values['fields'][] = $field_array; |
| 44 | 40 | |
| @@ -171,14 +167,8 @@ | ||
| 171 | 167 | |
| 172 | 168 | return $message; |
| 173 | 169 | } |
| 174 | 170 | |
| 175 | - /** | |
| 176 | - * @param stdClass $entry | |
| 177 | - * @param stdClass $field | |
| 178 | - * @param array $atts | |
| 179 | - * @return string | |
| 180 | - */ | |
| 181 | 171 | public static function prepare_display_value( $entry, $field, $atts ) { |
| 182 | 172 | $field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false; |
| 183 | 173 | |
| 184 | 174 | if ( FrmAppHelper::pro_is_installed() ) { |
| @@ -193,16 +183,14 @@ | ||
| 193 | 183 | if ( $field->form_id == $entry->form_id || empty( $atts['embedded_field_id'] ) ) { |
| 194 | 184 | return self::display_value( $field_value, $field, $atts ); |
| 195 | 185 | } |
| 196 | 186 | |
| 197 | - if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 198 | - return ''; | |
| 199 | - } | |
| 187 | + // This is an embeded form. | |
| 188 | + $val = ''; | |
| 200 | 189 | |
| 201 | - // This is an embeded form. | |
| 202 | 190 | if ( strpos( $atts['embedded_field_id'], 'form' ) === 0 ) { |
| 203 | 191 | // This is a repeating section. |
| 204 | - $child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ), '', '', true ); | |
| 192 | + $child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) ); | |
| 205 | 193 | } else { |
| 206 | 194 | // Get all values for this field. |
| 207 | 195 | $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false; |
| 208 | 196 | |
| @@ -212,10 +200,10 @@ | ||
| 212 | 200 | } |
| 213 | 201 | |
| 214 | 202 | $field_value = array(); |
| 215 | 203 | |
| 216 | - if ( empty( $child_entries ) ) { | |
| 217 | - return ''; | |
| 204 | + if ( ! isset( $child_entries ) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) { | |
| 205 | + return $val; | |
| 218 | 206 | } |
| 219 | 207 | |
| 220 | 208 | foreach ( $child_entries as $child_entry ) { |
| 221 | 209 | $atts['item_id'] = $child_entry->id; |
| @@ -295,9 +283,9 @@ | ||
| 295 | 283 | return $value; |
| 296 | 284 | } |
| 297 | 285 | |
| 298 | 286 | $unfiltered_value = $value; |
| 299 | - FrmFieldsHelper::prepare_field_value( $unfiltered_value, $field->type ); | |
| 287 | + FrmAppHelper::unserialize_or_decode( $unfiltered_value ); | |
| 300 | 288 | |
| 301 | 289 | $value = apply_filters( 'frm_display_value_custom', $unfiltered_value, $field, $atts ); |
| 302 | 290 | $value = apply_filters( 'frm_display_' . $field->type . '_value_custom', $value, compact( 'field', 'atts' ) ); |
| 303 | 291 | |
| @@ -513,9 +501,8 @@ | ||
| 513 | 501 | /** |
| 514 | 502 | * Add submitted values to a string for spam checking. |
| 515 | 503 | * |
| 516 | 504 | * @param array $values |
| 517 | - * @return string | |
| 518 | 505 | */ |
| 519 | 506 | public static function entry_array_to_string( $values ) { |
| 520 | 507 | $content = ''; |
| 521 | 508 | foreach ( $values['item_meta'] as $val ) { |
| @@ -620,9 +607,9 @@ | ||
| 620 | 607 | |
| 621 | 608 | foreach ( $links as $link ) { |
| 622 | 609 | ?> |
| 623 | 610 | <div class="misc-pub-section"> |
| 624 | - <a href="<?php echo esc_url( $link['url'] ); ?>" | |
| 611 | + <a href="<?php echo esc_url( FrmAppHelper::maybe_full_screen_link( $link['url'] ) ); ?>" | |
| 625 | 612 | <?php |
| 626 | 613 | if ( isset( $link['data'] ) ) { |
| 627 | 614 | foreach ( $link['data'] as $data => $value ) { |
| 628 | 615 | echo 'data-' . esc_attr( $data ) . '="' . esc_attr( $value ) . '" '; |
| @@ -660,9 +647,9 @@ | ||
| 660 | 647 | } |
| 661 | 648 | |
| 662 | 649 | if ( current_user_can( 'frm_delete_entries' ) ) { |
| 663 | 650 | $actions['frm_delete'] = array( |
| 664 | - 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id ) ), | |
| 651 | + 'url' => admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id ), | |
| 665 | 652 | 'label' => __( 'Delete Entry', 'formidable' ), |
| 666 | 653 | 'icon' => 'frm_icon_font frm_delete_icon', |
| 667 | 654 | 'data' => array( |
| 668 | 655 | 'frmverify' => __( 'Delete this form entry?', 'formidable' ), |
