| @@ -171,14 +171,8 @@ | ||
| 171 | 171 | |
| 172 | 172 | return $message; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - /** | |
| 176 | - * @param stdClass $entry | |
| 177 | - * @param stdClass $field | |
| 178 | - * @param array $atts | |
| 179 | - * @return string | |
| 180 | - */ | |
| 181 | 175 | public static function prepare_display_value( $entry, $field, $atts ) { |
| 182 | 176 | $field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false; |
| 183 | 177 | |
| 184 | 178 | if ( FrmAppHelper::pro_is_installed() ) { |
| @@ -193,16 +187,14 @@ | ||
| 193 | 187 | if ( $field->form_id == $entry->form_id || empty( $atts['embedded_field_id'] ) ) { |
| 194 | 188 | return self::display_value( $field_value, $field, $atts ); |
| 195 | 189 | } |
| 196 | 190 | |
| 197 | - if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 198 | - return ''; | |
| 199 | - } | |
| 191 | + // This is an embeded form. | |
| 192 | + $val = ''; | |
| 200 | 193 | |
| 201 | - // This is an embeded form. | |
| 202 | 194 | if ( strpos( $atts['embedded_field_id'], 'form' ) === 0 ) { |
| 203 | 195 | // This is a repeating section. |
| 204 | - $child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ), '', '', true ); | |
| 196 | + $child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) ); | |
| 205 | 197 | } else { |
| 206 | 198 | // Get all values for this field. |
| 207 | 199 | $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false; |
| 208 | 200 | |
| @@ -212,10 +204,10 @@ | ||
| 212 | 204 | } |
| 213 | 205 | |
| 214 | 206 | $field_value = array(); |
| 215 | 207 | |
| 216 | - if ( empty( $child_entries ) ) { | |
| 217 | - return ''; | |
| 208 | + if ( ! isset( $child_entries ) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) { | |
| 209 | + return $val; | |
| 218 | 210 | } |
| 219 | 211 | |
| 220 | 212 | foreach ( $child_entries as $child_entry ) { |
| 221 | 213 | $atts['item_id'] = $child_entry->id; |
| @@ -295,9 +287,9 @@ | ||
| 295 | 287 | return $value; |
| 296 | 288 | } |
| 297 | 289 | |
| 298 | 290 | $unfiltered_value = $value; |
| 299 | - FrmFieldsHelper::prepare_field_value( $unfiltered_value, $field->type ); | |
| 291 | + FrmAppHelper::unserialize_or_decode( $unfiltered_value ); | |
| 300 | 292 | |
| 301 | 293 | $value = apply_filters( 'frm_display_value_custom', $unfiltered_value, $field, $atts ); |
| 302 | 294 | $value = apply_filters( 'frm_display_' . $field->type . '_value_custom', $value, compact( 'field', 'atts' ) ); |
| 303 | 295 | |
| @@ -620,9 +612,9 @@ | ||
| 620 | 612 | |
| 621 | 613 | foreach ( $links as $link ) { |
| 622 | 614 | ?> |
| 623 | 615 | <div class="misc-pub-section"> |
| 624 | - <a href="<?php echo esc_url( $link['url'] ); ?>" | |
| 616 | + <a href="<?php echo esc_url( FrmAppHelper::maybe_full_screen_link( $link['url'] ) ); ?>" | |
| 625 | 617 | <?php |
| 626 | 618 | if ( isset( $link['data'] ) ) { |
| 627 | 619 | foreach ( $link['data'] as $data => $value ) { |
| 628 | 620 | echo 'data-' . esc_attr( $data ) . '="' . esc_attr( $value ) . '" '; |
| @@ -660,9 +652,9 @@ | ||
| 660 | 652 | } |
| 661 | 653 | |
| 662 | 654 | if ( current_user_can( 'frm_delete_entries' ) ) { |
| 663 | 655 | $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 ) ), | |
| 656 | + 'url' => admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id ), | |
| 665 | 657 | 'label' => __( 'Delete Entry', 'formidable' ), |
| 666 | 658 | 'icon' => 'frm_icon_font frm_delete_icon', |
| 667 | 659 | 'data' => array( |
| 668 | 660 | 'frmverify' => __( 'Delete this form entry?', 'formidable' ), |
