Completed
Pull Request — develop (#1191)
by Zack
16:19
created
includes/class-api.php 1 patch
Spacing   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 
404 404
 		// If we've saved the permalink in memory, use it
405 405
 		// @since 1.3
406
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
406
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
407 407
 
408
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
408
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
409 409
 			$link = home_url();
410 410
 		}
411 411
 
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
 			// If not yet saved, cache the permalink.
416 416
 			// @since 1.3
417
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
417
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
418 418
 		}
419 419
 
420 420
 		// Deal with returning to proper pagination for embedded views
@@ -422,13 +422,13 @@  discard block
 block discarded – undo
422 422
 
423 423
 			$args = array();
424 424
 
425
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
-				$args['pagenum'] = intval( $pagenum );
425
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
+				$args[ 'pagenum' ] = intval( $pagenum );
427 427
 			}
428 428
 
429
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
-				$args['sort'] = $sort;
431
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
429
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
+				$args[ 'sort' ] = $sort;
431
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
432 432
 			}
433 433
 
434 434
 			$link = add_query_arg( $args, $link );
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
466 466
 
467 467
 		// Generate an unique hash to use as the default value
468
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
468
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
469 469
 
470 470
 		/**
471 471
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
477 477
 
478 478
 		// Make sure we have something - use the original ID as backup.
479
-		if( empty( $slug ) ) {
479
+		if ( empty( $slug ) ) {
480 480
 			$slug = $id;
481 481
 		}
482 482
 
@@ -570,15 +570,15 @@  discard block
 block discarded – undo
570 570
          * @param boolean $custom Should we process the custom entry slug?
571 571
          */
572 572
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
573
-        if( $custom ) {
573
+        if ( $custom ) {
574 574
             // create the gravityview_unique_id and save it
575 575
 
576 576
             // Get the entry hash
577
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
577
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
578 578
 
579
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
579
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
580 580
 
581
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
581
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
582 582
 
583 583
         }
584 584
     }
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 
598 598
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
599 599
 			$entry = GVCommon::get_entry( $entry );
600
-		} else if( empty( $entry ) ) {
600
+		} else if ( empty( $entry ) ) {
601 601
 			// @deprecated path
602 602
 			$entry = GravityView_frontend::getInstance()->getEntry();
603 603
 		}
@@ -617,9 +617,9 @@  discard block
 block discarded – undo
617 617
 
618 618
 		$query_arg_name = \GV\Entry::get_endpoint_name();
619 619
 
620
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
620
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
621 621
 
622
-		if ( get_option('permalink_structure') && !is_preview() ) {
622
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
623 623
 
624 624
 			$args = array();
625 625
 
@@ -629,9 +629,9 @@  discard block
 block discarded – undo
629 629
 			 */
630 630
 			$link_parts = explode( '?', $directory_link );
631 631
 
632
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
632
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
633 633
 
634
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
634
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
635 635
 
636 636
 		} else {
637 637
 
@@ -643,21 +643,21 @@  discard block
 block discarded – undo
643 643
 		 */
644 644
 		if ( $add_directory_args ) {
645 645
 
646
-			if ( ! empty( $_GET['pagenum'] ) ) {
647
-				$args['pagenum'] = intval( $_GET['pagenum'] );
646
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
647
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
648 648
 			}
649 649
 
650 650
 			/**
651 651
 			 * @since 1.7
652 652
 			 */
653 653
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
654
-				$args['sort'] = $sort;
655
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
654
+				$args[ 'sort' ] = $sort;
655
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
656 656
 			}
657 657
 
658 658
 		}
659 659
 
660
-		if( $post_id ) {
660
+		if ( $post_id ) {
661 661
 			$passed_post = get_post( $post_id );
662 662
 			$views       = \GV\View_Collection::from_post( $passed_post );
663 663
 			$has_multiple_views = $views->count() > 1;
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 		}
667 667
 
668 668
 		if ( $has_multiple_views ) {
669
-			$args['gvid'] = gravityview_get_view_id();
669
+			$args[ 'gvid' ] = gravityview_get_view_id();
670 670
 		}
671 671
 
672 672
 		return add_query_arg( $args, $directory_link );
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 }
688 688
 
689 689
 function gv_class( $field, $form = NULL, $entry = array() ) {
690
-	return GravityView_API::field_class( $field, $form, $entry  );
690
+	return GravityView_API::field_class( $field, $form, $entry );
691 691
 }
692 692
 
693 693
 /**
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
 		$view_id = 0;
711 711
 		if ( $context->view ) {
712 712
 			$view_id = $context->view->ID;
713
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
713
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
714 714
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
715 715
 			}
716 716
 		}
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 		$default_css_class .= ' gv-container-no-results';
739 739
 	}
740 740
 
741
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
741
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
742 742
 
743 743
 	/**
744 744
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 
766 766
 	$value = GravityView_API::field_value( $entry, $field );
767 767
 
768
-	if( $value === '' ) {
768
+	if ( $value === '' ) {
769 769
 		/**
770 770
 		 * @filter `gravityview_empty_value` What to display when a field is empty
771 771
 		 * @param string $value (empty string)
@@ -878,7 +878,7 @@  discard block
 block discarded – undo
878 878
  */
879 879
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
880 880
 
881
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
881
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
882 882
 
883 883
 		// For the complete field value as generated by Gravity Forms
884 884
 		return $display_value;
@@ -912,16 +912,16 @@  discard block
 block discarded – undo
912 912
 		$terms = explode( ', ', $value );
913 913
 	}
914 914
 
915
-	foreach ($terms as $term_name ) {
915
+	foreach ( $terms as $term_name ) {
916 916
 
917 917
 		// If we're processing a category,
918
-		if( $taxonomy === 'category' ) {
918
+		if ( $taxonomy === 'category' ) {
919 919
 
920 920
 			// Use rgexplode to prevent errors if : doesn't exist
921 921
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
922 922
 
923 923
 			// The explode was succesful; we have the category ID
924
-			if( !empty( $term_id )) {
924
+			if ( ! empty( $term_id ) ) {
925 925
 				$term = get_term_by( 'id', $term_id, $taxonomy );
926 926
 			} else {
927 927
 			// We have to fall back to the name
@@ -934,7 +934,7 @@  discard block
 block discarded – undo
934 934
 		}
935 935
 
936 936
 		// There's still a tag/category here.
937
-		if( $term ) {
937
+		if ( $term ) {
938 938
 
939 939
 			$term_link = get_term_link( $term, $taxonomy );
940 940
 
@@ -943,11 +943,11 @@  discard block
 block discarded – undo
943 943
 			    continue;
944 944
 			}
945 945
 
946
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
946
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
947 947
 		}
948 948
 	}
949 949
 
950
-	return implode(', ', $output );
950
+	return implode( ', ', $output );
951 951
 }
952 952
 
953 953
 /**
@@ -961,8 +961,8 @@  discard block
 block discarded – undo
961 961
 
962 962
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
963 963
 
964
-	if( empty( $link ) ) {
965
-		return strip_tags( $output);
964
+	if ( empty( $link ) ) {
965
+		return strip_tags( $output );
966 966
 	}
967 967
 
968 968
 	return $output;
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 	$fe = GravityView_frontend::getInstance();
982 982
 
983 983
 	// Solve problem when loading content via admin-ajax.php
984
-	if( ! $fe->getGvOutputData() ) {
984
+	if ( ! $fe->getGvOutputData() ) {
985 985
 
986 986
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
987 987
 
@@ -989,7 +989,7 @@  discard block
 block discarded – undo
989 989
 	}
990 990
 
991 991
 	// Make 100% sure that we're dealing with a properly called situation
992
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
992
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
993 993
 
994 994
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
995 995
 
@@ -1211,12 +1211,12 @@  discard block
 block discarded – undo
1211 1211
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1212 1212
 	/** @define "GRAVITYVIEW_DIR" "../" */
1213 1213
 
1214
-	if( !class_exists( 'GravityView_Field' ) ) {
1215
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1214
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1215
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1216 1216
 	}
1217 1217
 
1218
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1219
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1218
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1219
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1220 1220
 	}
1221 1221
 
1222 1222
 	if ( is_null( $context ) ) {
@@ -1319,21 +1319,21 @@  discard block
 block discarded – undo
1319 1319
 	} else {
1320 1320
 		// @deprecated path
1321 1321
 		// Required fields.
1322
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1322
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1323 1323
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1324 1324
 			return '';
1325 1325
 		}
1326 1326
 	}
1327 1327
 
1328 1328
 	if ( $context instanceof \GV\Template_Context ) {
1329
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1330
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1331
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1329
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1330
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1331
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1332 1332
 	} else {
1333 1333
 		// @deprecated path
1334
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1335
-		$field = $args['field'];
1336
-		$form = $args['form'];
1334
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1335
+		$field = $args[ 'field' ];
1336
+		$form = $args[ 'form' ];
1337 1337
 	}
1338 1338
 
1339 1339
 	/**
@@ -1353,43 +1353,43 @@  discard block
 block discarded – undo
1353 1353
 	);
1354 1354
 
1355 1355
 	if ( $context instanceof \GV\Template_Context ) {
1356
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1356
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1357 1357
 	} else {
1358 1358
 		// @deprecated path
1359
-		$placeholders['value'] = gv_value( $entry, $field );
1359
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1360 1360
 	}
1361 1361
 
1362 1362
 	// If the value is empty and we're hiding empty, return empty.
1363
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1363
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1364 1364
 		return '';
1365 1365
 	}
1366 1366
 
1367
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1368
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1367
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1368
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1369 1369
 	}
1370 1370
 
1371 1371
 	// Get width setting, if exists
1372
-	$placeholders['width'] = GravityView_API::field_width( $field );
1372
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1373 1373
 
1374 1374
 	// If replacing with CSS inline formatting, let's do it.
1375
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1375
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1376 1376
 
1377 1377
 	// Grab the Class using `gv_class`
1378
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1379
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1378
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1379
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1380 1380
 
1381 1381
 	if ( $context instanceof \GV\Template_Context ) {
1382
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1382
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1383 1383
 	} else {
1384 1384
 		// Default Label value
1385
-		$placeholders['label_value'] = gv_label( $field, $entry );
1385
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1386 1386
 	}
1387 1387
 
1388
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1389
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1388
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1389
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1390 1390
 
1391
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1392
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1391
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1392
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1393 1393
 	}
1394 1394
 
1395 1395
 	/**
@@ -1400,7 +1400,7 @@  discard block
 block discarded – undo
1400 1400
 	 * @since 2.0
1401 1401
 	 * @param \GV\Template_Context $context The context.
1402 1402
 	 */
1403
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1403
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1404 1404
 
1405 1405
 	/**
1406 1406
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1427,7 +1427,7 @@  discard block
 block discarded – undo
1427 1427
 	foreach ( $placeholders as $tag => $value ) {
1428 1428
 
1429 1429
 		// If the tag doesn't exist just skip it
1430
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1430
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1431 1431
 			continue;
1432 1432
 		}
1433 1433
 
Please login to merge, or discard this patch.