Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions includes/abstracts/class-evf-form-fields-upload.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ abstract class EVF_Form_Fields_Upload extends EVF_Form_Fields {
*/
public function init_hooks() {
add_action( 'everest_forms_shortcode_scripts', array( $this, 'load_assets' ) );
add_filter( 'everest_forms_html_field_value', array( $this, 'html_field_value' ), 10, 4 );
add_filter( 'everest_forms_html_field_value', array( $this, 'html_field_value' ), 10, 5 );
add_filter( 'everest_forms_plaintext_field_value', array( $this, 'plaintext_field_value' ), 10, 4 );
add_filter( 'everest_forms_field_exporter_' . $this->type, array( $this, 'field_exporter' ) );
add_filter( 'everest_forms_email_file_attachments', array( $this, 'send_file_as_email_attachment' ), 99, 6 );
Expand Down Expand Up @@ -777,7 +777,7 @@ public function media_library( $field ) {
* @param string $context Value display context.
* @return string $val Html Value.
*/
public function html_field_value( $val, $field_val, $form_data = array(), $context = '' ) {
public function html_field_value( $val, $field_val, $form_data = array(), $context = '', $field_meta_key = '' ) {
$meta_key = '';
$entry_id = false;
$uploads = wp_upload_dir();
Expand Down Expand Up @@ -843,7 +843,7 @@ public function html_field_value( $val, $field_val, $form_data = array(), $conte

if ( isset( $_GET['view-entry'] ) && 'entry-single' === $context ) { // phpcs:ignore WordPress.Security.NonceVerification
$entry_id = absint( $_GET['view-entry'] ); // phpcs:ignore WordPress.Security.NonceVerification
$meta_key = array_search( $val, $form_data, true );
$meta_key = ! empty( $field_meta_key ) ? evf_clean( $field_meta_key ) : array_search( $val, $form_data, true );
} elseif ( isset( $_GET['edit-entry'], $field_val['meta_key'] ) && 'entry-single' === $context ) { // phpcs:ignore WordPress.Security.NonceVerification
$entry_id = absint( $_GET['edit-entry'] ); // phpcs:ignore WordPress.Security.NonceVerification
$meta_key = evf_clean( $field_val['meta_key'] );
Expand Down Expand Up @@ -873,6 +873,7 @@ public function html_field_value( $val, $field_val, $form_data = array(), $conte
foreach ( $field['value_raw'] as $file ) {
if ( empty( $file['value'] ) || empty( $file['file_original'] ) ) {
$output[ $meta_key ] = '';
continue;
}

$file_url = esc_url( $file['value'] );
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/views/html-admin-page-entries-view.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class="evf-toggle-empty everest-forms-empty-field-toggle password_preview dashic
$meta_value = $meta_value['value'];
}

$field_value = apply_filters( 'everest_forms_html_field_value', $meta_value, $entry_meta[ $meta_key ], $entry_meta, 'entry-single' );
$field_value = apply_filters( 'everest_forms_html_field_value', $meta_value, $entry_meta[ $meta_key ], $entry_meta, 'entry-single', $meta_key );
$is_empty = is_string( $field_value ) && ( '(empty)' === wp_strip_all_tags( $field_value ) || '' === $field_value );
$field_class = $is_empty ? 'evf-field-empty' : '';
$correct_answers = false;
Expand Down
Loading