Completed
Push — develop ( 89334a...6095d5 )
by Gennady
16:29
created
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +301 added lines, -301 removed lines patch added patch discarded remove patch
@@ -102,10 +102,10 @@  discard block
 block discarded – undo
102 102
 
103 103
 	/**
104 104
 	 * ID of the current post. May also be ID of the current View.
105
-     *
106
-     * @since 2.0.13
107
-     * 
108
-     * @var int
105
+	 *
106
+	 * @since 2.0.13
107
+	 * 
108
+	 * @var int
109 109
 	 */
110 110
 	public $post_id;
111 111
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	public function prevent_maybe_process_form() {
190 190
 
191
-	    if( ! $this->is_edit_entry_submission() ) {
191
+		if( ! $this->is_edit_entry_submission() ) {
192 192
 			return;
193 193
 		}
194 194
 
@@ -222,14 +222,14 @@  discard block
 block discarded – undo
222 222
 	 * When Edit entry view is requested setup the vars
223 223
 	 */
224 224
 	private function setup_vars() {
225
-        global $post;
225
+		global $post;
226 226
 
227 227
 		$gravityview_view = GravityView_View::getInstance();
228 228
 
229 229
 
230 230
 		$entries = $gravityview_view->getEntries();
231
-	    self::$original_entry = $entries[0];
232
-	    $this->entry = $entries[0];
231
+		self::$original_entry = $entries[0];
232
+		$this->entry = $entries[0];
233 233
 
234 234
 		self::$original_form = $gravityview_view->getForm();
235 235
 		$this->form = $gravityview_view->getForm();
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
 
372 372
 			GFFormsModel::save_lead( $form, $this->entry );
373 373
 
374
-	        // Delete the values for hidden inputs
375
-	        $this->unset_hidden_field_values();
374
+			// Delete the values for hidden inputs
375
+			$this->unset_hidden_field_values();
376 376
 			
377 377
 			$this->entry['date_created'] = $date_created;
378 378
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 			// Perform actions normally performed after updating a lead
383 383
 			$this->after_update();
384 384
 
385
-	        /**
385
+			/**
386 386
 			 * Must be AFTER after_update()!
387 387
 			 * @see https://github.com/gravityview/GravityView/issues/764
388 388
 			 */
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
 
391 391
 			/**
392 392
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
393
-             * @since 2.1 Added $gv_data parameter
393
+			 * @since 2.1 Added $gv_data parameter
394 394
 			 * @param array $form Gravity Forms form array
395 395
 			 * @param string $entry_id Numeric ID of the entry that was updated
396 396
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 	 * @return void
415 415
 	 */
416 416
 	private function unset_hidden_field_values() {
417
-	    global $wpdb;
417
+		global $wpdb;
418 418
 
419 419
 		/**
420 420
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
439 439
 		}
440 440
 
441
-	    foreach ( $this->entry as $input_id => $field_value ) {
441
+		foreach ( $this->entry as $input_id => $field_value ) {
442 442
 
443 443
 			if ( ! is_numeric( $input_id ) ) {
444 444
 				continue;
@@ -448,8 +448,8 @@  discard block
 block discarded – undo
448 448
 				continue;
449 449
 			}
450 450
 
451
-		    // Reset fields that are or would be hidden
452
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) {
451
+			// Reset fields that are or would be hidden
452
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), $this->entry ) ) {
453 453
 
454 454
 				$empty_value = $field->get_value_save_entry(
455 455
 					is_array( $field->get_entry_inputs() ) ? array() : '',
@@ -461,16 +461,16 @@  discard block
 block discarded – undo
461 461
 					$empty_value = '';
462 462
 				}
463 463
 
464
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
464
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
465 465
 
466
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
466
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
467 467
 
468
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
468
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
469 469
 				// after submission
470
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
471
-			    $_POST[ $post_input_id ] = '';
472
-		    }
473
-	    }
470
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
471
+				$_POST[ $post_input_id ] = '';
472
+			}
473
+		}
474 474
 	}
475 475
 
476 476
 	/**
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
 
565 565
 		$form = $this->filter_conditional_logic( $this->form );
566 566
 
567
-	    /** @var GF_Field $field */
567
+		/** @var GF_Field $field */
568 568
 		foreach( $form['fields'] as $k => &$field ) {
569 569
 
570 570
 			/**
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 
581 581
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
582 582
 				foreach( $field->inputs as $key => $input ) {
583
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
583
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
584 584
 				}
585 585
 			}
586 586
 		}
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
 
621 621
 				$inputs = $field->get_entry_inputs();
622 622
 				if ( is_array( $inputs ) ) {
623
-				    foreach ( $inputs as $input ) {
623
+					foreach ( $inputs as $input ) {
624 624
 						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
625 625
 
626 626
 						if ( 'product' === $field->type ) {
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 						}
640 640
 
641 641
 						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
642
-				    }
642
+					}
643 643
 				} else {
644 644
 					// Set to what it previously was if it's not editable
645 645
 					if ( ! in_array( $field->id, $allowed_fields ) ) {
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
686 686
 
687 687
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
688
-	        $ary = stripslashes_deep( $ary );
688
+			$ary = stripslashes_deep( $ary );
689 689
 			$img_url = \GV\Utils::get( $ary, 0 );
690 690
 
691 691
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
 	private function maybe_update_post_fields( $form ) {
759 759
 
760 760
 		if( empty( $this->entry['post_id'] ) ) {
761
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
761
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
762 762
 			return;
763 763
 		}
764 764
 
@@ -793,49 +793,49 @@  discard block
 block discarded – undo
793 793
 
794 794
 				switch( $field->type ) {
795 795
 
796
-				    case 'post_title':
797
-				        $post_title = $value;
798
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
799
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
800
-				        }
801
-				        $updated_post->post_title = $post_title;
802
-				        $updated_post->post_name  = $post_title;
803
-				        unset( $post_title );
804
-				        break;
805
-
806
-				    case 'post_content':
807
-				        $post_content = $value;
808
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
809
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
810
-				        }
811
-				        $updated_post->post_content = $post_content;
812
-				        unset( $post_content );
813
-				        break;
814
-				    case 'post_excerpt':
815
-				        $updated_post->post_excerpt = $value;
816
-				        break;
817
-				    case 'post_tags':
818
-				        wp_set_post_tags( $post_id, $value, false );
819
-				        break;
820
-				    case 'post_category':
821
-				        break;
822
-				    case 'post_custom_field':
796
+					case 'post_title':
797
+						$post_title = $value;
798
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
799
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
800
+						}
801
+						$updated_post->post_title = $post_title;
802
+						$updated_post->post_name  = $post_title;
803
+						unset( $post_title );
804
+						break;
805
+
806
+					case 'post_content':
807
+						$post_content = $value;
808
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
809
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
810
+						}
811
+						$updated_post->post_content = $post_content;
812
+						unset( $post_content );
813
+						break;
814
+					case 'post_excerpt':
815
+						$updated_post->post_excerpt = $value;
816
+						break;
817
+					case 'post_tags':
818
+						wp_set_post_tags( $post_id, $value, false );
819
+						break;
820
+					case 'post_category':
821
+						break;
822
+					case 'post_custom_field':
823 823
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
824 824
 							$value = $value[ $field_id ];
825 825
 						}
826 826
 
827
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
828
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
829
-				        }
827
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
828
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
829
+						}
830 830
 
831 831
 						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
832 832
 
833
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
834
-				        break;
833
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
834
+						break;
835 835
 
836
-				    case 'post_image':
837
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
838
-				        break;
836
+					case 'post_image':
837
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
838
+						break;
839 839
 
840 840
 				}
841 841
 
@@ -992,14 +992,14 @@  discard block
 block discarded – undo
992 992
 			?><h2 class="gv-edit-entry-title">
993 993
 				<span><?php
994 994
 
995
-				    /**
996
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
997
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
998
-				     * @param GravityView_Edit_Entry_Render $this This object
999
-				     */
1000
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
995
+					/**
996
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
997
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
998
+					 * @param GravityView_Edit_Entry_Render $this This object
999
+					 */
1000
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
1001 1001
 
1002
-				    echo esc_attr( $edit_entry_title );
1002
+					echo esc_attr( $edit_entry_title );
1003 1003
 			?></span>
1004 1004
 			</h2>
1005 1005
 
@@ -1054,13 +1054,13 @@  discard block
 block discarded – undo
1054 1054
 				);
1055 1055
 
1056 1056
 				/**
1057
-				* @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1058
-				* @since 1.16.3
1059
-				* @param array $labels Default button labels associative array
1060
-				* @param array $form The Gravity Forms form
1061
-				* @param array $entry The Gravity Forms entry
1062
-				* @param int $view_id The current View ID
1063
-				*/
1057
+				 * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1058
+				 * @since 1.16.3
1059
+				 * @param array $labels Default button labels associative array
1060
+				 * @param array $form The Gravity Forms form
1061
+				 * @param array $entry The Gravity Forms entry
1062
+				 * @param int $view_id The current View ID
1063
+				 */
1064 1064
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1065 1065
 
1066 1066
 				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
@@ -1097,26 +1097,26 @@  discard block
 block discarded – undo
1097 1097
 
1098 1098
 				switch ( $edit_redirect ) {
1099 1099
 
1100
-                    case '0':
1101
-	                    $redirect_url = $back_link;
1102
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1103
-                        break;
1104
-
1105
-                    case '1':
1106
-	                    $redirect_url = $directory_link = GravityView_API::directory_link();
1107
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1108
-	                    break;
1109
-
1110
-                    case '2':
1111
-	                    $redirect_url = $edit_redirect_url;
1112
-	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1113
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1114
-                        break;
1115
-
1116
-                    case '':
1117
-                    default:
1118
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1119
-                        break;
1100
+					case '0':
1101
+						$redirect_url = $back_link;
1102
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1103
+						break;
1104
+
1105
+					case '1':
1106
+						$redirect_url = $directory_link = GravityView_API::directory_link();
1107
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1108
+						break;
1109
+
1110
+					case '2':
1111
+						$redirect_url = $edit_redirect_url;
1112
+						$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1113
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1114
+						break;
1115
+
1116
+					case '':
1117
+					default:
1118
+						$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1119
+						break;
1120 1120
 				}
1121 1121
 
1122 1122
 				if ( isset( $redirect_url ) ) {
@@ -1182,13 +1182,13 @@  discard block
 block discarded – undo
1182 1182
 				);
1183 1183
 
1184 1184
 				/**
1185
-				* @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1186
-				* @since 1.16.3
1187
-				* @param array $labels Default button labels associative array
1188
-				* @param array $form The Gravity Forms form
1189
-				* @param array $entry The Gravity Forms entry
1190
-				* @param int $view_id The current View ID
1191
-				*/
1185
+				 * @filter `gravityview/edit_entry/button_labels` Modify the cancel/submit buttons' labels
1186
+				 * @since 1.16.3
1187
+				 * @param array $labels Default button labels associative array
1188
+				 * @param array $form The Gravity Forms form
1189
+				 * @param array $entry The Gravity Forms entry
1190
+				 * @param int $view_id The current View ID
1191
+				 */
1192 1192
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1193 1193
 
1194 1194
 				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
 
1231 1231
 		ob_get_clean();
1232 1232
 
1233
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1233
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1234 1234
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1235 1235
 		remove_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) );
1236 1236
 		remove_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
@@ -1290,7 +1290,7 @@  discard block
 block discarded – undo
1290 1290
 
1291 1291
 		// for now we don't support Save and Continue feature.
1292 1292
 		if( ! self::$supports_save_and_continue ) {
1293
-	        unset( $form['save'] );
1293
+			unset( $form['save'] );
1294 1294
 		}
1295 1295
 
1296 1296
 		$form = $this->unselect_default_values( $form );
@@ -1317,30 +1317,30 @@  discard block
 block discarded – undo
1317 1317
 			return $field_content;
1318 1318
 		}
1319 1319
 
1320
-        $message = null;
1320
+		$message = null;
1321 1321
 
1322
-        // First, make sure they have the capability to edit the post.
1323
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1322
+		// First, make sure they have the capability to edit the post.
1323
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1324 1324
 
1325
-            /**
1326
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1327
-             * @param string $message The existing "You don't have permission..." text
1328
-             */
1329
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1325
+			/**
1326
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1327
+			 * @param string $message The existing "You don't have permission..." text
1328
+			 */
1329
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1330 1330
 
1331
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1332
-            /**
1333
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1334
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
1335
-             */
1336
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1337
-        }
1331
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
1332
+			/**
1333
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1334
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
1335
+			 */
1336
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1337
+		}
1338 1338
 
1339
-        if( $message ) {
1340
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1341
-        }
1339
+		if( $message ) {
1340
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1341
+		}
1342 1342
 
1343
-        return $field_content;
1343
+		return $field_content;
1344 1344
 	}
1345 1345
 
1346 1346
 	/**
@@ -1368,7 +1368,7 @@  discard block
 block discarded – undo
1368 1368
 			|| ! empty( $field_content )
1369 1369
 			|| in_array( $field->type, array( 'honeypot' ) )
1370 1370
 		) {
1371
-	        return $field_content;
1371
+			return $field_content;
1372 1372
 		}
1373 1373
 
1374 1374
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1376,24 +1376,24 @@  discard block
 block discarded – undo
1376 1376
 
1377 1377
 		$field_value = $this->get_field_value( $field );
1378 1378
 
1379
-	    // Prevent any PHP warnings, like undefined index
1380
-	    ob_start();
1379
+		// Prevent any PHP warnings, like undefined index
1380
+		ob_start();
1381 1381
 
1382
-	    $return = null;
1382
+		$return = null;
1383 1383
 
1384 1384
 		/** @var GravityView_Field $gv_field */
1385 1385
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1386 1386
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1387 1387
 		} else {
1388
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1389
-	    }
1388
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1389
+		}
1390 1390
 
1391
-	    // If there was output, it's an error
1392
-	    $warnings = ob_get_clean();
1391
+		// If there was output, it's an error
1392
+		$warnings = ob_get_clean();
1393 1393
 
1394
-	    if( !empty( $warnings ) ) {
1395
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1396
-	    }
1394
+		if( !empty( $warnings ) ) {
1395
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1396
+		}
1397 1397
 
1398 1398
 		return $return;
1399 1399
 	}
@@ -1428,8 +1428,8 @@  discard block
 block discarded – undo
1428 1428
 				$input_id = strval( $input['id'] );
1429 1429
 
1430 1430
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1431
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1432
-				    $allow_pre_populated = false;
1431
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1432
+					$allow_pre_populated = false;
1433 1433
 				}
1434 1434
 
1435 1435
 			}
@@ -1453,7 +1453,7 @@  discard block
 block discarded – undo
1453 1453
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1454 1454
 				$categories = array();
1455 1455
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1456
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1456
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1457 1457
 				}
1458 1458
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1459 1459
 			}
@@ -1463,25 +1463,25 @@  discard block
 block discarded – undo
1463 1463
 		// if value is empty get the default value if defined
1464 1464
 		$field_value = $field->get_value_default_if_empty( $field_value );
1465 1465
 
1466
-	    /**
1467
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1468
-	     * @since 1.11
1469
-	     * @since 1.20 Added third param
1470
-	     * @param mixed $field_value field value used to populate the input
1471
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1472
-	     * @param GravityView_Edit_Entry_Render $this Current object
1473
-	     */
1474
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1475
-
1476
-	    /**
1477
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1478
-	     * @since 1.17
1479
-	     * @since 1.20 Added third param
1480
-	     * @param mixed $field_value field value used to populate the input
1481
-	     * @param GF_Field $field Gravity Forms field object
1482
-	     * @param GravityView_Edit_Entry_Render $this Current object
1483
-	     */
1484
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1466
+		/**
1467
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1468
+		 * @since 1.11
1469
+		 * @since 1.20 Added third param
1470
+		 * @param mixed $field_value field value used to populate the input
1471
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1472
+		 * @param GravityView_Edit_Entry_Render $this Current object
1473
+		 */
1474
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1475
+
1476
+		/**
1477
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1478
+		 * @since 1.17
1479
+		 * @since 1.20 Added third param
1480
+		 * @param mixed $field_value field value used to populate the input
1481
+		 * @param GF_Field $field Gravity Forms field object
1482
+		 * @param GravityView_Edit_Entry_Render $this Current object
1483
+		 */
1484
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1485 1485
 
1486 1486
 		return $field_value;
1487 1487
 	}
@@ -1508,7 +1508,7 @@  discard block
 block discarded – undo
1508 1508
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1509 1509
 			// expects certain field array items to be set.
1510 1510
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1511
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1511
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1512 1512
 			}
1513 1513
 
1514 1514
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1522,61 +1522,61 @@  discard block
 block discarded – undo
1522 1522
 				 */
1523 1523
 				case 'fileupload':
1524 1524
 
1525
-				    // Set the previous value
1526
-				    $entry = $this->get_entry();
1525
+					// Set the previous value
1526
+					$entry = $this->get_entry();
1527 1527
 
1528
-				    $input_name = 'input_'.$field->id;
1529
-				    $form_id = $form['id'];
1528
+					$input_name = 'input_'.$field->id;
1529
+					$form_id = $form['id'];
1530 1530
 
1531
-				    $value = NULL;
1531
+					$value = NULL;
1532 1532
 
1533
-				    // Use the previous entry value as the default.
1534
-				    if( isset( $entry[ $field->id ] ) ) {
1535
-				        $value = $entry[ $field->id ];
1536
-				    }
1533
+					// Use the previous entry value as the default.
1534
+					if( isset( $entry[ $field->id ] ) ) {
1535
+						$value = $entry[ $field->id ];
1536
+					}
1537 1537
 
1538
-				    // If this is a single upload file
1539
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1540
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1541
-				        $value = $file_path['url'];
1538
+					// If this is a single upload file
1539
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1540
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1541
+						$value = $file_path['url'];
1542 1542
 
1543
-				    } else {
1543
+					} else {
1544 1544
 
1545
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1546
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1547
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1545
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1546
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1547
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1548 1548
 
1549
-				    }
1549
+					}
1550 1550
 
1551
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1551
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1552 1552
 
1553
-				        // If there are fresh uploads, process and merge them.
1554
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1555
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1556
-				            $value = empty( $value ) ? '[]' : $value;
1557
-				            $value = stripslashes_deep( $value );
1558
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1559
-				        }
1553
+						// If there are fresh uploads, process and merge them.
1554
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1555
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1556
+							$value = empty( $value ) ? '[]' : $value;
1557
+							$value = stripslashes_deep( $value );
1558
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1559
+						}
1560 1560
 
1561
-				    } else {
1561
+					} else {
1562 1562
 
1563
-				        // A file already exists when editing an entry
1564
-				        // We set this to solve issue when file upload fields are required.
1565
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1563
+						// A file already exists when editing an entry
1564
+						// We set this to solve issue when file upload fields are required.
1565
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1566 1566
 
1567
-				    }
1567
+					}
1568 1568
 
1569
-				    $this->entry[ $input_name ] = $value;
1570
-				    $_POST[ $input_name ] = $value;
1569
+					$this->entry[ $input_name ] = $value;
1570
+					$_POST[ $input_name ] = $value;
1571 1571
 
1572
-				    break;
1572
+					break;
1573 1573
 
1574 1574
 				case 'number':
1575
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1576
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1577
-				        $_POST['input_'.$field->id ] = NULL;
1578
-				    }
1579
-				    break;
1575
+					// Fix "undefined index" issue at line 1286 in form_display.php
1576
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1577
+						$_POST['input_'.$field->id ] = NULL;
1578
+					}
1579
+					break;
1580 1580
 			}
1581 1581
 
1582 1582
 		}
@@ -1661,43 +1661,43 @@  discard block
 block discarded – undo
1661 1661
 				case 'fileupload' :
1662 1662
 				case 'post_image':
1663 1663
 
1664
-				    // in case nothing is uploaded but there are already files saved
1665
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1666
-				        $field->failed_validation = false;
1667
-				        unset( $field->validation_message );
1668
-				    }
1664
+					// in case nothing is uploaded but there are already files saved
1665
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1666
+						$field->failed_validation = false;
1667
+						unset( $field->validation_message );
1668
+					}
1669 1669
 
1670
-				    // validate if multi file upload reached max number of files [maxFiles] => 2
1671
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1670
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1671
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1672 1672
 
1673
-				        $input_name = 'input_' . $field->id;
1674
-				        //uploaded
1675
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1673
+						$input_name = 'input_' . $field->id;
1674
+						//uploaded
1675
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1676 1676
 
1677
-				        //existent
1678
-				        $entry = $this->get_entry();
1679
-				        $value = NULL;
1680
-				        if( isset( $entry[ $field->id ] ) ) {
1681
-				            $value = json_decode( $entry[ $field->id ], true );
1682
-				        }
1677
+						//existent
1678
+						$entry = $this->get_entry();
1679
+						$value = NULL;
1680
+						if( isset( $entry[ $field->id ] ) ) {
1681
+							$value = json_decode( $entry[ $field->id ], true );
1682
+						}
1683 1683
 
1684
-				        // count uploaded files and existent entry files
1685
-				        $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1686
-						               ( is_array( $value ) ? count( $value ) : 0 );
1684
+						// count uploaded files and existent entry files
1685
+						$count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1686
+									   ( is_array( $value ) ? count( $value ) : 0 );
1687 1687
 
1688
-				        if( $count_files > $field->maxFiles ) {
1689
-				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1690
-				            $field->failed_validation = 1;
1691
-				            $gv_valid = false;
1688
+						if( $count_files > $field->maxFiles ) {
1689
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1690
+							$field->failed_validation = 1;
1691
+							$gv_valid = false;
1692 1692
 
1693
-				            // in case of error make sure the newest upload files are removed from the upload input
1694
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1695
-				        }
1693
+							// in case of error make sure the newest upload files are removed from the upload input
1694
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1695
+						}
1696 1696
 
1697
-				    }
1697
+					}
1698 1698
 
1699 1699
 
1700
-				    break;
1700
+					break;
1701 1701
 
1702 1702
 			}
1703 1703
 
@@ -1708,47 +1708,47 @@  discard block
 block discarded – undo
1708 1708
 
1709 1709
 				switch ( $field_type ) {
1710 1710
 
1711
-				    // Captchas don't need to be re-entered.
1712
-				    case 'captcha':
1711
+					// Captchas don't need to be re-entered.
1712
+					case 'captcha':
1713 1713
 
1714
-				        // Post Image fields aren't editable, so we un-fail them.
1715
-				    case 'post_image':
1716
-				        $field->failed_validation = false;
1717
-				        unset( $field->validation_message );
1718
-				        break;
1714
+						// Post Image fields aren't editable, so we un-fail them.
1715
+					case 'post_image':
1716
+						$field->failed_validation = false;
1717
+						unset( $field->validation_message );
1718
+						break;
1719 1719
 
1720 1720
 				}
1721 1721
 
1722 1722
 				// You can't continue inside a switch, so we do it after.
1723 1723
 				if( empty( $field->failed_validation ) ) {
1724
-				    continue;
1724
+					continue;
1725 1725
 				}
1726 1726
 
1727 1727
 				// checks if the No Duplicates option is not validating entry against itself, since
1728 1728
 				// we're editing a stored entry, it would also assume it's a duplicate.
1729 1729
 				if( !empty( $field->noDuplicates ) ) {
1730 1730
 
1731
-				    $entry = $this->get_entry();
1731
+					$entry = $this->get_entry();
1732 1732
 
1733
-				    // If the value of the entry is the same as the stored value
1734
-				    // Then we can assume it's not a duplicate, it's the same.
1735
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1736
-				        //if value submitted was not changed, then don't validate
1737
-				        $field->failed_validation = false;
1733
+					// If the value of the entry is the same as the stored value
1734
+					// Then we can assume it's not a duplicate, it's the same.
1735
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1736
+						//if value submitted was not changed, then don't validate
1737
+						$field->failed_validation = false;
1738 1738
 
1739
-				        unset( $field->validation_message );
1739
+						unset( $field->validation_message );
1740 1740
 
1741
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1741
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1742 1742
 
1743
-				        continue;
1744
-				    }
1743
+						continue;
1744
+					}
1745 1745
 				}
1746 1746
 
1747 1747
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1748 1748
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1749
-				    unset( $field->validation_message );
1750
-	                $field->validation_message = false;
1751
-				    continue;
1749
+					unset( $field->validation_message );
1750
+					$field->validation_message = false;
1751
+					continue;
1752 1752
 				}
1753 1753
 
1754 1754
 				$gv_valid = false;
@@ -1812,8 +1812,8 @@  discard block
 block discarded – undo
1812 1812
 		// Hide fields depending on admin settings
1813 1813
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1814 1814
 
1815
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1816
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1815
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1816
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1817 1817
 
1818 1818
 		/**
1819 1819
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1892,11 +1892,11 @@  discard block
 block discarded – undo
1892 1892
 		// The edit tab has been configured, so we loop through to configured settings
1893 1893
 		foreach ( $configured_fields as $configured_field ) {
1894 1894
 
1895
-	        /** @var GF_Field $field */
1896
-	        foreach ( $fields as $field ) {
1895
+			/** @var GF_Field $field */
1896
+			foreach ( $fields as $field ) {
1897 1897
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1898
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1899
-				    break;
1898
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1899
+					break;
1900 1900
 				}
1901 1901
 
1902 1902
 			}
@@ -1952,28 +1952,28 @@  discard block
 block discarded – undo
1952 1952
 	 */
1953 1953
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1954 1954
 
1955
-	    /**
1955
+		/**
1956 1956
 		 * @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
1957
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1958
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1959
-	     * @since 1.9.1
1960
-	     * @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.
1961
-	     * @param array $form GF Form array
1962
-	     * @param int $view_id View ID
1963
-	     */
1964
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1965
-
1966
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1957
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1958
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1959
+		 * @since 1.9.1
1960
+		 * @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.
1961
+		 * @param array $form GF Form array
1962
+		 * @param int $view_id View ID
1963
+		 */
1964
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1965
+
1966
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1967 1967
 			foreach( $fields as $k => $field ) {
1968 1968
 				if( $field->adminOnly ) {
1969
-				    unset( $fields[ $k ] );
1969
+					unset( $fields[ $k ] );
1970 1970
 				}
1971 1971
 			}
1972 1972
 			return array_values( $fields );
1973 1973
 		}
1974 1974
 
1975
-	    foreach( $fields as &$field ) {
1976
-		    $field->adminOnly = false;
1975
+		foreach( $fields as &$field ) {
1976
+			$field->adminOnly = false;
1977 1977
 		}
1978 1978
 
1979 1979
 		return $fields;
@@ -1993,13 +1993,13 @@  discard block
 block discarded – undo
1993 1993
 	 */
1994 1994
 	private function unselect_default_values( $form ) {
1995 1995
 
1996
-	    foreach ( $form['fields'] as &$field ) {
1996
+		foreach ( $form['fields'] as &$field ) {
1997 1997
 
1998 1998
 			if ( empty( $field->choices ) ) {
1999
-                continue;
1999
+				continue;
2000 2000
 			}
2001 2001
 
2002
-            foreach ( $field->choices as &$choice ) {
2002
+			foreach ( $field->choices as &$choice ) {
2003 2003
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
2004 2004
 					$choice['isSelected'] = false;
2005 2005
 				}
@@ -2036,36 +2036,36 @@  discard block
 block discarded – undo
2036 2036
 
2037 2037
 			if( 'checkbox' === $field->type ) {
2038 2038
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
2039
-				    $input_id = $input['id'];
2040
-				    $choice = $field->choices[ $key ];
2041
-				    $value = \GV\Utils::get( $this->entry, $input_id );
2042
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
2043
-				    if( $match ) {
2044
-				        $field->choices[ $key ]['isSelected'] = true;
2045
-				    }
2039
+					$input_id = $input['id'];
2040
+					$choice = $field->choices[ $key ];
2041
+					$value = \GV\Utils::get( $this->entry, $input_id );
2042
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
2043
+					if( $match ) {
2044
+						$field->choices[ $key ]['isSelected'] = true;
2045
+					}
2046 2046
 				}
2047 2047
 			} else {
2048 2048
 
2049 2049
 				// We need to run through each field to set the default values
2050 2050
 				foreach ( $this->entry as $field_id => $field_value ) {
2051 2051
 
2052
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
2052
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
2053 2053
 
2054
-				        if( 'list' === $field->type ) {
2055
-				            $list_rows = maybe_unserialize( $field_value );
2054
+						if( 'list' === $field->type ) {
2055
+							$list_rows = maybe_unserialize( $field_value );
2056 2056
 
2057
-				            $list_field_value = array();
2058
-				            foreach ( (array) $list_rows as $row ) {
2059
-				                foreach ( (array) $row as $column ) {
2060
-				                    $list_field_value[] = $column;
2061
-				                }
2062
-				            }
2057
+							$list_field_value = array();
2058
+							foreach ( (array) $list_rows as $row ) {
2059
+								foreach ( (array) $row as $column ) {
2060
+									$list_field_value[] = $column;
2061
+								}
2062
+							}
2063 2063
 
2064
-				            $field->defaultValue = serialize( $list_field_value );
2065
-				        } else {
2066
-				            $field->defaultValue = $field_value;
2067
-				        }
2068
-				    }
2064
+							$field->defaultValue = serialize( $list_field_value );
2065
+						} else {
2066
+							$field->defaultValue = $field_value;
2067
+						}
2068
+					}
2069 2069
 				}
2070 2070
 			}
2071 2071
 		}
@@ -2126,7 +2126,7 @@  discard block
 block discarded – undo
2126 2126
 			foreach ( $form['fields'] as &$field ) {
2127 2127
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
2128 2128
 
2129
-				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
2129
+					list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
2130 2130
 
2131 2131
 					if ( $field['id'] == $rule_field_id ) {
2132 2132
 						unset( $field->conditionalLogic['rules'][ $rule_i ] );
@@ -2177,7 +2177,7 @@  discard block
 block discarded – undo
2177 2177
 			return $has_conditional_logic;
2178 2178
 		}
2179 2179
 
2180
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2180
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
2181 2181
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
2182 2182
 	}
2183 2183
 
@@ -2244,14 +2244,14 @@  discard block
 block discarded – undo
2244 2244
 
2245 2245
 		if( $echo && $error !== true ) {
2246 2246
 
2247
-	        $error = esc_html( $error );
2247
+			$error = esc_html( $error );
2248 2248
 
2249
-	        /**
2250
-	         * @since 1.9
2251
-	         */
2252
-	        if ( ! empty( $this->entry ) ) {
2253
-		        $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;" ) );
2254
-	        }
2249
+			/**
2250
+			 * @since 1.9
2251
+			 */
2252
+			if ( ! empty( $this->entry ) ) {
2253
+				$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;" ) );
2254
+			}
2255 2255
 
2256 2256
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
2257 2257
 		}
Please login to merge, or discard this patch.