@@ -94,10 +94,10 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * ID of the current post. May also be ID of the current View. |
| 97 | - * |
|
| 98 | - * @since 2.0.13 |
|
| 99 | - * |
|
| 100 | - * @var int |
|
| 97 | + * |
|
| 98 | + * @since 2.0.13 |
|
| 99 | + * |
|
| 100 | + * @var int |
|
| 101 | 101 | */ |
| 102 | 102 | public $post_id; |
| 103 | 103 | |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | public function prevent_maybe_process_form() { |
| 170 | 170 | |
| 171 | 171 | if( ! empty( $_POST ) ) { |
| 172 | - gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 172 | + gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | if( $this->is_edit_entry_submission() ) { |
| 176 | 176 | remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
| 177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | * When Edit entry view is requested setup the vars |
| 203 | 203 | */ |
| 204 | 204 | private function setup_vars() { |
| 205 | - global $post; |
|
| 205 | + global $post; |
|
| 206 | 206 | |
| 207 | 207 | $gravityview_view = GravityView_View::getInstance(); |
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | $entries = $gravityview_view->getEntries(); |
| 211 | - self::$original_entry = $entries[0]; |
|
| 212 | - $this->entry = $entries[0]; |
|
| 211 | + self::$original_entry = $entries[0]; |
|
| 212 | + $this->entry = $entries[0]; |
|
| 213 | 213 | |
| 214 | 214 | self::$original_form = $gravityview_view->getForm(); |
| 215 | 215 | $this->form = $gravityview_view->getForm(); |
@@ -331,8 +331,8 @@ discard block |
||
| 331 | 331 | |
| 332 | 332 | GFFormsModel::save_lead( $form, $this->entry ); |
| 333 | 333 | |
| 334 | - // Delete the values for hidden inputs |
|
| 335 | - $this->unset_hidden_field_values(); |
|
| 334 | + // Delete the values for hidden inputs |
|
| 335 | + $this->unset_hidden_field_values(); |
|
| 336 | 336 | |
| 337 | 337 | $this->entry['date_created'] = $date_created; |
| 338 | 338 | |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | // Perform actions normally performed after updating a lead |
| 343 | 343 | $this->after_update(); |
| 344 | 344 | |
| 345 | - /** |
|
| 345 | + /** |
|
| 346 | 346 | * Must be AFTER after_update()! |
| 347 | 347 | * @see https://github.com/gravityview/GravityView/issues/764 |
| 348 | 348 | */ |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | * @return void |
| 373 | 373 | */ |
| 374 | 374 | private function unset_hidden_field_values() { |
| 375 | - global $wpdb; |
|
| 375 | + global $wpdb; |
|
| 376 | 376 | |
| 377 | 377 | /** |
| 378 | 378 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -394,27 +394,27 @@ discard block |
||
| 394 | 394 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
| 397 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
| 398 | 398 | |
| 399 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 399 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 400 | 400 | |
| 401 | - // Reset fields that are hidden |
|
| 402 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 403 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 401 | + // Reset fields that are hidden |
|
| 402 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 403 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 404 | 404 | |
| 405 | - // List fields are stored as empty arrays when empty |
|
| 406 | - $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
| 405 | + // List fields are stored as empty arrays when empty |
|
| 406 | + $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
| 407 | 407 | |
| 408 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 408 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 409 | 409 | |
| 410 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 410 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 411 | 411 | |
| 412 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 412 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 413 | 413 | // after submission |
| 414 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 415 | - $_POST[ $post_input_id ] = ''; |
|
| 416 | - } |
|
| 417 | - } |
|
| 414 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 415 | + $_POST[ $post_input_id ] = ''; |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | /** |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | $form = $this->form; |
| 510 | 510 | |
| 511 | - /** @var GF_Field $field */ |
|
| 511 | + /** @var GF_Field $field */ |
|
| 512 | 512 | foreach( $form['fields'] as $k => &$field ) { |
| 513 | 513 | |
| 514 | 514 | /** |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | |
| 525 | 525 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
| 526 | 526 | foreach( $field->inputs as $key => $input ) { |
| 527 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 527 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
@@ -545,13 +545,13 @@ discard block |
||
| 545 | 545 | foreach ( $this->fields_with_calculation as $calc_field ) { |
| 546 | 546 | $inputs = $calc_field->get_entry_inputs(); |
| 547 | 547 | if ( is_array( $inputs ) ) { |
| 548 | - foreach ( $inputs as $input ) { |
|
| 549 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 550 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 551 | - } |
|
| 548 | + foreach ( $inputs as $input ) { |
|
| 549 | + $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 550 | + $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 551 | + } |
|
| 552 | 552 | } else { |
| 553 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
| 554 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 553 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
| 554 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 555 | 555 | } |
| 556 | 556 | } |
| 557 | 557 | |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
| 600 | 600 | |
| 601 | 601 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 602 | - $ary = stripslashes_deep( $ary ); |
|
| 602 | + $ary = stripslashes_deep( $ary ); |
|
| 603 | 603 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 604 | 604 | |
| 605 | 605 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | private function maybe_update_post_fields( $form ) { |
| 673 | 673 | |
| 674 | 674 | if( empty( $this->entry['post_id'] ) ) { |
| 675 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 675 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 676 | 676 | return; |
| 677 | 677 | } |
| 678 | 678 | |
@@ -707,51 +707,51 @@ discard block |
||
| 707 | 707 | |
| 708 | 708 | switch( $field->type ) { |
| 709 | 709 | |
| 710 | - case 'post_title': |
|
| 711 | - $post_title = $value; |
|
| 712 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 713 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 714 | - } |
|
| 715 | - $updated_post->post_title = $post_title; |
|
| 716 | - $updated_post->post_name = $post_title; |
|
| 717 | - unset( $post_title ); |
|
| 718 | - break; |
|
| 719 | - |
|
| 720 | - case 'post_content': |
|
| 721 | - $post_content = $value; |
|
| 722 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 723 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 724 | - } |
|
| 725 | - $updated_post->post_content = $post_content; |
|
| 726 | - unset( $post_content ); |
|
| 727 | - break; |
|
| 728 | - case 'post_excerpt': |
|
| 729 | - $updated_post->post_excerpt = $value; |
|
| 730 | - break; |
|
| 731 | - case 'post_tags': |
|
| 732 | - wp_set_post_tags( $post_id, $value, false ); |
|
| 733 | - break; |
|
| 734 | - case 'post_category': |
|
| 735 | - break; |
|
| 736 | - case 'post_custom_field': |
|
| 710 | + case 'post_title': |
|
| 711 | + $post_title = $value; |
|
| 712 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 713 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 714 | + } |
|
| 715 | + $updated_post->post_title = $post_title; |
|
| 716 | + $updated_post->post_name = $post_title; |
|
| 717 | + unset( $post_title ); |
|
| 718 | + break; |
|
| 719 | + |
|
| 720 | + case 'post_content': |
|
| 721 | + $post_content = $value; |
|
| 722 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 723 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 724 | + } |
|
| 725 | + $updated_post->post_content = $post_content; |
|
| 726 | + unset( $post_content ); |
|
| 727 | + break; |
|
| 728 | + case 'post_excerpt': |
|
| 729 | + $updated_post->post_excerpt = $value; |
|
| 730 | + break; |
|
| 731 | + case 'post_tags': |
|
| 732 | + wp_set_post_tags( $post_id, $value, false ); |
|
| 733 | + break; |
|
| 734 | + case 'post_category': |
|
| 735 | + break; |
|
| 736 | + case 'post_custom_field': |
|
| 737 | 737 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
| 738 | 738 | $value = $value[ $field_id ]; |
| 739 | 739 | } |
| 740 | 740 | |
| 741 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 742 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 743 | - } |
|
| 741 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 742 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 743 | + } |
|
| 744 | 744 | |
| 745 | - if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
| 746 | - $value = wp_json_encode( $value ); |
|
| 747 | - } |
|
| 745 | + if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
| 746 | + $value = wp_json_encode( $value ); |
|
| 747 | + } |
|
| 748 | 748 | |
| 749 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 750 | - break; |
|
| 749 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 750 | + break; |
|
| 751 | 751 | |
| 752 | - case 'post_image': |
|
| 753 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 754 | - break; |
|
| 752 | + case 'post_image': |
|
| 753 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 754 | + break; |
|
| 755 | 755 | |
| 756 | 756 | } |
| 757 | 757 | |
@@ -796,20 +796,20 @@ discard block |
||
| 796 | 796 | */ |
| 797 | 797 | private function is_field_json_encoded( $field ) { |
| 798 | 798 | |
| 799 | - $json_encoded = false; |
|
| 799 | + $json_encoded = false; |
|
| 800 | 800 | |
| 801 | 801 | $input_type = RGFormsModel::get_input_type( $field ); |
| 802 | 802 | |
| 803 | - // Only certain custom field types are supported |
|
| 804 | - switch( $input_type ) { |
|
| 805 | - case 'fileupload': |
|
| 806 | - case 'list': |
|
| 807 | - case 'multiselect': |
|
| 808 | - $json_encoded = true; |
|
| 809 | - break; |
|
| 810 | - } |
|
| 803 | + // Only certain custom field types are supported |
|
| 804 | + switch( $input_type ) { |
|
| 805 | + case 'fileupload': |
|
| 806 | + case 'list': |
|
| 807 | + case 'multiselect': |
|
| 808 | + $json_encoded = true; |
|
| 809 | + break; |
|
| 810 | + } |
|
| 811 | 811 | |
| 812 | - return $json_encoded; |
|
| 812 | + return $json_encoded; |
|
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | /** |
@@ -899,14 +899,14 @@ discard block |
||
| 899 | 899 | ?><h2 class="gv-edit-entry-title"> |
| 900 | 900 | <span><?php |
| 901 | 901 | |
| 902 | - /** |
|
| 903 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 904 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 905 | - * @param GravityView_Edit_Entry_Render $this This object |
|
| 906 | - */ |
|
| 907 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 902 | + /** |
|
| 903 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 904 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 905 | + * @param GravityView_Edit_Entry_Render $this This object |
|
| 906 | + */ |
|
| 907 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 908 | 908 | |
| 909 | - echo esc_attr( $edit_entry_title ); |
|
| 909 | + echo esc_attr( $edit_entry_title ); |
|
| 910 | 910 | ?></span> |
| 911 | 911 | </h2> |
| 912 | 912 | |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | |
| 1016 | 1016 | ob_get_clean(); |
| 1017 | 1017 | |
| 1018 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1018 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1019 | 1019 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
| 1020 | 1020 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1021 | 1021 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | |
| 1070 | 1070 | // for now we don't support Save and Continue feature. |
| 1071 | 1071 | if( ! self::$supports_save_and_continue ) { |
| 1072 | - unset( $form['save'] ); |
|
| 1072 | + unset( $form['save'] ); |
|
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | 1075 | return $form; |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | || ! empty( $field_content ) |
| 1145 | 1145 | || in_array( $field->type, array( 'honeypot' ) ) |
| 1146 | 1146 | ) { |
| 1147 | - return $field_content; |
|
| 1147 | + return $field_content; |
|
| 1148 | 1148 | } |
| 1149 | 1149 | |
| 1150 | 1150 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1152,24 +1152,24 @@ discard block |
||
| 1152 | 1152 | |
| 1153 | 1153 | $field_value = $this->get_field_value( $field ); |
| 1154 | 1154 | |
| 1155 | - // Prevent any PHP warnings, like undefined index |
|
| 1156 | - ob_start(); |
|
| 1155 | + // Prevent any PHP warnings, like undefined index |
|
| 1156 | + ob_start(); |
|
| 1157 | 1157 | |
| 1158 | - $return = null; |
|
| 1158 | + $return = null; |
|
| 1159 | 1159 | |
| 1160 | 1160 | /** @var GravityView_Field $gv_field */ |
| 1161 | 1161 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
| 1162 | 1162 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1163 | 1163 | } else { |
| 1164 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1165 | - } |
|
| 1164 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1165 | + } |
|
| 1166 | 1166 | |
| 1167 | - // If there was output, it's an error |
|
| 1168 | - $warnings = ob_get_clean(); |
|
| 1167 | + // If there was output, it's an error |
|
| 1168 | + $warnings = ob_get_clean(); |
|
| 1169 | 1169 | |
| 1170 | - if( !empty( $warnings ) ) { |
|
| 1171 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1172 | - } |
|
| 1170 | + if( !empty( $warnings ) ) { |
|
| 1171 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1172 | + } |
|
| 1173 | 1173 | |
| 1174 | 1174 | return $return; |
| 1175 | 1175 | } |
@@ -1204,8 +1204,8 @@ discard block |
||
| 1204 | 1204 | $input_id = strval( $input['id'] ); |
| 1205 | 1205 | |
| 1206 | 1206 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1207 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1208 | - $allow_pre_populated = false; |
|
| 1207 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1208 | + $allow_pre_populated = false; |
|
| 1209 | 1209 | } |
| 1210 | 1210 | |
| 1211 | 1211 | } |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
| 1230 | 1230 | $categories = array(); |
| 1231 | 1231 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1232 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1232 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1233 | 1233 | } |
| 1234 | 1234 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1235 | 1235 | } |
@@ -1239,25 +1239,25 @@ discard block |
||
| 1239 | 1239 | // if value is empty get the default value if defined |
| 1240 | 1240 | $field_value = $field->get_value_default_if_empty( $field_value ); |
| 1241 | 1241 | |
| 1242 | - /** |
|
| 1243 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1244 | - * @since 1.11 |
|
| 1245 | - * @since 1.20 Added third param |
|
| 1246 | - * @param mixed $field_value field value used to populate the input |
|
| 1247 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1248 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1249 | - */ |
|
| 1250 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1251 | - |
|
| 1252 | - /** |
|
| 1253 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1254 | - * @since 1.17 |
|
| 1255 | - * @since 1.20 Added third param |
|
| 1256 | - * @param mixed $field_value field value used to populate the input |
|
| 1257 | - * @param GF_Field $field Gravity Forms field object |
|
| 1258 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1259 | - */ |
|
| 1260 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1242 | + /** |
|
| 1243 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1244 | + * @since 1.11 |
|
| 1245 | + * @since 1.20 Added third param |
|
| 1246 | + * @param mixed $field_value field value used to populate the input |
|
| 1247 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1248 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1249 | + */ |
|
| 1250 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1251 | + |
|
| 1252 | + /** |
|
| 1253 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1254 | + * @since 1.17 |
|
| 1255 | + * @since 1.20 Added third param |
|
| 1256 | + * @param mixed $field_value field value used to populate the input |
|
| 1257 | + * @param GF_Field $field Gravity Forms field object |
|
| 1258 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1259 | + */ |
|
| 1260 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1261 | 1261 | |
| 1262 | 1262 | return $field_value; |
| 1263 | 1263 | } |
@@ -1284,7 +1284,7 @@ discard block |
||
| 1284 | 1284 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1285 | 1285 | // expects certain field array items to be set. |
| 1286 | 1286 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
| 1287 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1287 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1288 | 1288 | } |
| 1289 | 1289 | |
| 1290 | 1290 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1298,61 +1298,61 @@ discard block |
||
| 1298 | 1298 | */ |
| 1299 | 1299 | case 'fileupload': |
| 1300 | 1300 | |
| 1301 | - // Set the previous value |
|
| 1302 | - $entry = $this->get_entry(); |
|
| 1301 | + // Set the previous value |
|
| 1302 | + $entry = $this->get_entry(); |
|
| 1303 | 1303 | |
| 1304 | - $input_name = 'input_'.$field->id; |
|
| 1305 | - $form_id = $form['id']; |
|
| 1304 | + $input_name = 'input_'.$field->id; |
|
| 1305 | + $form_id = $form['id']; |
|
| 1306 | 1306 | |
| 1307 | - $value = NULL; |
|
| 1307 | + $value = NULL; |
|
| 1308 | 1308 | |
| 1309 | - // Use the previous entry value as the default. |
|
| 1310 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1311 | - $value = $entry[ $field->id ]; |
|
| 1312 | - } |
|
| 1309 | + // Use the previous entry value as the default. |
|
| 1310 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1311 | + $value = $entry[ $field->id ]; |
|
| 1312 | + } |
|
| 1313 | 1313 | |
| 1314 | - // If this is a single upload file |
|
| 1315 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1316 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1317 | - $value = $file_path['url']; |
|
| 1314 | + // If this is a single upload file |
|
| 1315 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1316 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1317 | + $value = $file_path['url']; |
|
| 1318 | 1318 | |
| 1319 | - } else { |
|
| 1319 | + } else { |
|
| 1320 | 1320 | |
| 1321 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1322 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1323 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1321 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1322 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1323 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1324 | 1324 | |
| 1325 | - } |
|
| 1325 | + } |
|
| 1326 | 1326 | |
| 1327 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1327 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1328 | 1328 | |
| 1329 | - // If there are fresh uploads, process and merge them. |
|
| 1330 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1331 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1332 | - $value = empty( $value ) ? '[]' : $value; |
|
| 1333 | - $value = stripslashes_deep( $value ); |
|
| 1334 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1335 | - } |
|
| 1329 | + // If there are fresh uploads, process and merge them. |
|
| 1330 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1331 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1332 | + $value = empty( $value ) ? '[]' : $value; |
|
| 1333 | + $value = stripslashes_deep( $value ); |
|
| 1334 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1335 | + } |
|
| 1336 | 1336 | |
| 1337 | - } else { |
|
| 1337 | + } else { |
|
| 1338 | 1338 | |
| 1339 | - // A file already exists when editing an entry |
|
| 1340 | - // We set this to solve issue when file upload fields are required. |
|
| 1341 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1339 | + // A file already exists when editing an entry |
|
| 1340 | + // We set this to solve issue when file upload fields are required. |
|
| 1341 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1342 | 1342 | |
| 1343 | - } |
|
| 1343 | + } |
|
| 1344 | 1344 | |
| 1345 | - $this->entry[ $input_name ] = $value; |
|
| 1346 | - $_POST[ $input_name ] = $value; |
|
| 1345 | + $this->entry[ $input_name ] = $value; |
|
| 1346 | + $_POST[ $input_name ] = $value; |
|
| 1347 | 1347 | |
| 1348 | - break; |
|
| 1348 | + break; |
|
| 1349 | 1349 | |
| 1350 | 1350 | case 'number': |
| 1351 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1352 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1353 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1354 | - } |
|
| 1355 | - break; |
|
| 1351 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1352 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1353 | + $_POST['input_'.$field->id ] = NULL; |
|
| 1354 | + } |
|
| 1355 | + break; |
|
| 1356 | 1356 | } |
| 1357 | 1357 | |
| 1358 | 1358 | } |
@@ -1437,42 +1437,42 @@ discard block |
||
| 1437 | 1437 | case 'fileupload' : |
| 1438 | 1438 | case 'post_image': |
| 1439 | 1439 | |
| 1440 | - // in case nothing is uploaded but there are already files saved |
|
| 1441 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1442 | - $field->failed_validation = false; |
|
| 1443 | - unset( $field->validation_message ); |
|
| 1444 | - } |
|
| 1440 | + // in case nothing is uploaded but there are already files saved |
|
| 1441 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1442 | + $field->failed_validation = false; |
|
| 1443 | + unset( $field->validation_message ); |
|
| 1444 | + } |
|
| 1445 | 1445 | |
| 1446 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1447 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1446 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1447 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1448 | 1448 | |
| 1449 | - $input_name = 'input_' . $field->id; |
|
| 1450 | - //uploaded |
|
| 1451 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1449 | + $input_name = 'input_' . $field->id; |
|
| 1450 | + //uploaded |
|
| 1451 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1452 | 1452 | |
| 1453 | - //existent |
|
| 1454 | - $entry = $this->get_entry(); |
|
| 1455 | - $value = NULL; |
|
| 1456 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1457 | - $value = json_decode( $entry[ $field->id ], true ); |
|
| 1458 | - } |
|
| 1453 | + //existent |
|
| 1454 | + $entry = $this->get_entry(); |
|
| 1455 | + $value = NULL; |
|
| 1456 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1457 | + $value = json_decode( $entry[ $field->id ], true ); |
|
| 1458 | + } |
|
| 1459 | 1459 | |
| 1460 | - // count uploaded files and existent entry files |
|
| 1461 | - $count_files = count( $file_names ) + count( $value ); |
|
| 1460 | + // count uploaded files and existent entry files |
|
| 1461 | + $count_files = count( $file_names ) + count( $value ); |
|
| 1462 | 1462 | |
| 1463 | - if( $count_files > $field->maxFiles ) { |
|
| 1464 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1465 | - $field->failed_validation = 1; |
|
| 1466 | - $gv_valid = false; |
|
| 1463 | + if( $count_files > $field->maxFiles ) { |
|
| 1464 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1465 | + $field->failed_validation = 1; |
|
| 1466 | + $gv_valid = false; |
|
| 1467 | 1467 | |
| 1468 | - // in case of error make sure the newest upload files are removed from the upload input |
|
| 1469 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1470 | - } |
|
| 1468 | + // in case of error make sure the newest upload files are removed from the upload input |
|
| 1469 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1470 | + } |
|
| 1471 | 1471 | |
| 1472 | - } |
|
| 1472 | + } |
|
| 1473 | 1473 | |
| 1474 | 1474 | |
| 1475 | - break; |
|
| 1475 | + break; |
|
| 1476 | 1476 | |
| 1477 | 1477 | } |
| 1478 | 1478 | |
@@ -1483,47 +1483,47 @@ discard block |
||
| 1483 | 1483 | |
| 1484 | 1484 | switch ( $field_type ) { |
| 1485 | 1485 | |
| 1486 | - // Captchas don't need to be re-entered. |
|
| 1487 | - case 'captcha': |
|
| 1486 | + // Captchas don't need to be re-entered. |
|
| 1487 | + case 'captcha': |
|
| 1488 | 1488 | |
| 1489 | - // Post Image fields aren't editable, so we un-fail them. |
|
| 1490 | - case 'post_image': |
|
| 1491 | - $field->failed_validation = false; |
|
| 1492 | - unset( $field->validation_message ); |
|
| 1493 | - break; |
|
| 1489 | + // Post Image fields aren't editable, so we un-fail them. |
|
| 1490 | + case 'post_image': |
|
| 1491 | + $field->failed_validation = false; |
|
| 1492 | + unset( $field->validation_message ); |
|
| 1493 | + break; |
|
| 1494 | 1494 | |
| 1495 | 1495 | } |
| 1496 | 1496 | |
| 1497 | 1497 | // You can't continue inside a switch, so we do it after. |
| 1498 | 1498 | if( empty( $field->failed_validation ) ) { |
| 1499 | - continue; |
|
| 1499 | + continue; |
|
| 1500 | 1500 | } |
| 1501 | 1501 | |
| 1502 | 1502 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1503 | 1503 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1504 | 1504 | if( !empty( $field->noDuplicates ) ) { |
| 1505 | 1505 | |
| 1506 | - $entry = $this->get_entry(); |
|
| 1506 | + $entry = $this->get_entry(); |
|
| 1507 | 1507 | |
| 1508 | - // If the value of the entry is the same as the stored value |
|
| 1509 | - // Then we can assume it's not a duplicate, it's the same. |
|
| 1510 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1511 | - //if value submitted was not changed, then don't validate |
|
| 1512 | - $field->failed_validation = false; |
|
| 1508 | + // If the value of the entry is the same as the stored value |
|
| 1509 | + // Then we can assume it's not a duplicate, it's the same. |
|
| 1510 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1511 | + //if value submitted was not changed, then don't validate |
|
| 1512 | + $field->failed_validation = false; |
|
| 1513 | 1513 | |
| 1514 | - unset( $field->validation_message ); |
|
| 1514 | + unset( $field->validation_message ); |
|
| 1515 | 1515 | |
| 1516 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1516 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1517 | 1517 | |
| 1518 | - continue; |
|
| 1519 | - } |
|
| 1518 | + continue; |
|
| 1519 | + } |
|
| 1520 | 1520 | } |
| 1521 | 1521 | |
| 1522 | 1522 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1523 | 1523 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
| 1524 | - unset( $field->validation_message ); |
|
| 1525 | - $field->validation_message = false; |
|
| 1526 | - continue; |
|
| 1524 | + unset( $field->validation_message ); |
|
| 1525 | + $field->validation_message = false; |
|
| 1526 | + continue; |
|
| 1527 | 1527 | } |
| 1528 | 1528 | |
| 1529 | 1529 | $gv_valid = false; |
@@ -1587,8 +1587,8 @@ discard block |
||
| 1587 | 1587 | // Hide fields depending on admin settings |
| 1588 | 1588 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
| 1589 | 1589 | |
| 1590 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1591 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1590 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1591 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1592 | 1592 | |
| 1593 | 1593 | /** |
| 1594 | 1594 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1648,11 +1648,11 @@ discard block |
||
| 1648 | 1648 | // The edit tab has been configured, so we loop through to configured settings |
| 1649 | 1649 | foreach ( $configured_fields as $configured_field ) { |
| 1650 | 1650 | |
| 1651 | - /** @var GF_Field $field */ |
|
| 1652 | - foreach ( $fields as $field ) { |
|
| 1651 | + /** @var GF_Field $field */ |
|
| 1652 | + foreach ( $fields as $field ) { |
|
| 1653 | 1653 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
| 1654 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1655 | - break; |
|
| 1654 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1655 | + break; |
|
| 1656 | 1656 | } |
| 1657 | 1657 | |
| 1658 | 1658 | } |
@@ -1708,28 +1708,28 @@ discard block |
||
| 1708 | 1708 | */ |
| 1709 | 1709 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
| 1710 | 1710 | |
| 1711 | - /** |
|
| 1711 | + /** |
|
| 1712 | 1712 | * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true |
| 1713 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1714 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1715 | - * @since 1.9.1 |
|
| 1716 | - * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 1717 | - * @param array $form GF Form array |
|
| 1718 | - * @param int $view_id View ID |
|
| 1719 | - */ |
|
| 1720 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1721 | - |
|
| 1722 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1713 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1714 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1715 | + * @since 1.9.1 |
|
| 1716 | + * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 1717 | + * @param array $form GF Form array |
|
| 1718 | + * @param int $view_id View ID |
|
| 1719 | + */ |
|
| 1720 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1721 | + |
|
| 1722 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1723 | 1723 | foreach( $fields as $k => $field ) { |
| 1724 | 1724 | if( $field->adminOnly ) { |
| 1725 | - unset( $fields[ $k ] ); |
|
| 1725 | + unset( $fields[ $k ] ); |
|
| 1726 | 1726 | } |
| 1727 | 1727 | } |
| 1728 | 1728 | return $fields; |
| 1729 | 1729 | } |
| 1730 | 1730 | |
| 1731 | - foreach( $fields as &$field ) { |
|
| 1732 | - $field->adminOnly = false; |
|
| 1731 | + foreach( $fields as &$field ) { |
|
| 1732 | + $field->adminOnly = false; |
|
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | 1735 | return $fields; |
@@ -1762,36 +1762,36 @@ discard block |
||
| 1762 | 1762 | |
| 1763 | 1763 | if( 'checkbox' === $field->type ) { |
| 1764 | 1764 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1765 | - $input_id = $input['id']; |
|
| 1766 | - $choice = $field->choices[ $key ]; |
|
| 1767 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1768 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1769 | - if( $match ) { |
|
| 1770 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1771 | - } |
|
| 1765 | + $input_id = $input['id']; |
|
| 1766 | + $choice = $field->choices[ $key ]; |
|
| 1767 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1768 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1769 | + if( $match ) { |
|
| 1770 | + $field->choices[ $key ]['isSelected'] = true; |
|
| 1771 | + } |
|
| 1772 | 1772 | } |
| 1773 | 1773 | } else { |
| 1774 | 1774 | |
| 1775 | 1775 | // We need to run through each field to set the default values |
| 1776 | 1776 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1777 | 1777 | |
| 1778 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1778 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1779 | 1779 | |
| 1780 | - if( 'list' === $field->type ) { |
|
| 1781 | - $list_rows = maybe_unserialize( $field_value ); |
|
| 1780 | + if( 'list' === $field->type ) { |
|
| 1781 | + $list_rows = maybe_unserialize( $field_value ); |
|
| 1782 | 1782 | |
| 1783 | - $list_field_value = array(); |
|
| 1784 | - foreach ( (array) $list_rows as $row ) { |
|
| 1785 | - foreach ( (array) $row as $column ) { |
|
| 1786 | - $list_field_value[] = $column; |
|
| 1787 | - } |
|
| 1788 | - } |
|
| 1783 | + $list_field_value = array(); |
|
| 1784 | + foreach ( (array) $list_rows as $row ) { |
|
| 1785 | + foreach ( (array) $row as $column ) { |
|
| 1786 | + $list_field_value[] = $column; |
|
| 1787 | + } |
|
| 1788 | + } |
|
| 1789 | 1789 | |
| 1790 | - $field->defaultValue = serialize( $list_field_value ); |
|
| 1791 | - } else { |
|
| 1792 | - $field->defaultValue = $field_value; |
|
| 1793 | - } |
|
| 1794 | - } |
|
| 1790 | + $field->defaultValue = serialize( $list_field_value ); |
|
| 1791 | + } else { |
|
| 1792 | + $field->defaultValue = $field_value; |
|
| 1793 | + } |
|
| 1794 | + } |
|
| 1795 | 1795 | } |
| 1796 | 1796 | } |
| 1797 | 1797 | } |
@@ -1848,7 +1848,7 @@ discard block |
||
| 1848 | 1848 | return $has_conditional_logic; |
| 1849 | 1849 | } |
| 1850 | 1850 | |
| 1851 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1851 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1852 | 1852 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
| 1853 | 1853 | } |
| 1854 | 1854 | |
@@ -1915,14 +1915,14 @@ discard block |
||
| 1915 | 1915 | |
| 1916 | 1916 | if( $echo && $error !== true ) { |
| 1917 | 1917 | |
| 1918 | - $error = esc_html( $error ); |
|
| 1918 | + $error = esc_html( $error ); |
|
| 1919 | 1919 | |
| 1920 | - /** |
|
| 1921 | - * @since 1.9 |
|
| 1922 | - */ |
|
| 1923 | - if ( ! empty( $this->entry ) ) { |
|
| 1924 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1925 | - } |
|
| 1920 | + /** |
|
| 1921 | + * @since 1.9 |
|
| 1922 | + */ |
|
| 1923 | + if ( ! empty( $this->entry ) ) { |
|
| 1924 | + $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1925 | + } |
|
| 1926 | 1926 | |
| 1927 | 1927 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
| 1928 | 1928 | } |