Completed
Pull Request — master (#1422)
by Zack
02:15
created
includes/class-api.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -236,7 +236,6 @@  discard block
 block discarded – undo
236 236
 	 *
237 237
 	 * @access public
238 238
 	 * @param array $entry
239
-	 * @param array $field
240 239
 	 * @return null|string
241 240
 	 */
242 241
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
@@ -741,6 +740,9 @@  discard block
 block discarded – undo
741 740
 	return $value;
742 741
 }
743 742
 
743
+/**
744
+ * @param GV\Template_Context $context
745
+ */
744 746
 function gv_directory_link( $post = NULL, $add_pagination = true, $context = null ) {
745 747
 	return GravityView_API::directory_link( $post, $add_pagination, $context );
746 748
 }
@@ -1216,6 +1218,7 @@  discard block
 block discarded – undo
1216 1218
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
1217 1219
  * @since  2.0
1218 1220
  * @param  \GV\Template_Context The template context.
1221
+ * @param GV\Template_Context $context
1219 1222
  * @return string Field output. If empty value and hide empty is true, return empty.
1220 1223
  */
1221 1224
 function gravityview_field_output( $passed_args, $context = null ) {
Please login to merge, or discard this patch.
Spacing   +110 added lines, -110 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,34 +617,34 @@  discard block
 block discarded – undo
617 617
 
618 618
 		$query_arg_name = \GV\Entry::get_endpoint_name();
619 619
 
620
-		if ( ! empty( $entry['_multi'] ) ) {
620
+		if ( ! empty( $entry[ '_multi' ] ) ) {
621 621
 			$entry_slugs = array();
622
-			foreach ( $entry['_multi'] as $_multi ) {
622
+			foreach ( $entry[ '_multi' ] as $_multi ) {
623 623
 
624
-				if( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
625
-					$entry_slugs[] = $gv_multi->get_slug();
624
+				if ( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
625
+					$entry_slugs[ ] = $gv_multi->get_slug();
626 626
 				} else {
627
-					$entry_slugs[] = \GravityView_API::get_entry_slug( $entry['id'], $entry );
627
+					$entry_slugs[ ] = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
628 628
 				}
629 629
 
630 630
 				unset( $gv_multi );
631 631
 
632
-				$forms[] = $_multi['form_id'];
632
+				$forms[ ] = $_multi[ 'form_id' ];
633 633
 			}
634 634
 			$entry_slug = implode( ',', $entry_slugs );
635 635
 		} else {
636 636
 
637 637
 			// Fallback when
638
-			if( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
638
+			if ( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
639 639
 				$entry_slug = $gv_entry->get_slug();
640 640
 			} else {
641
-				$entry_slug = \GravityView_API::get_entry_slug( $entry['id'], $entry );
641
+				$entry_slug = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
642 642
 			}
643 643
 
644 644
 			unset( $gv_entry );
645 645
 		}
646 646
 
647
-		if ( get_option('permalink_structure') && !is_preview() ) {
647
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
648 648
 
649 649
 			$args = array();
650 650
 
@@ -654,9 +654,9 @@  discard block
 block discarded – undo
654 654
 			 */
655 655
 			$link_parts = explode( '?', $directory_link );
656 656
 
657
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
657
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
658 658
 
659
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
659
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
660 660
 
661 661
 		} else {
662 662
 
@@ -668,21 +668,21 @@  discard block
 block discarded – undo
668 668
 		 */
669 669
 		if ( $add_directory_args ) {
670 670
 
671
-			if ( ! empty( $_GET['pagenum'] ) ) {
672
-				$args['pagenum'] = intval( $_GET['pagenum'] );
671
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
672
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
673 673
 			}
674 674
 
675 675
 			/**
676 676
 			 * @since 1.7
677 677
 			 */
678 678
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
679
-				$args['sort'] = $sort;
680
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
679
+				$args[ 'sort' ] = $sort;
680
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
681 681
 			}
682 682
 
683 683
 		}
684 684
 
685
-		if( $post_id ) {
685
+		if ( $post_id ) {
686 686
 			$passed_post = get_post( $post_id );
687 687
 			$views       = \GV\View_Collection::from_post( $passed_post );
688 688
 			$has_multiple_views = $views->count() > 1;
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
 		}
692 692
 
693 693
 		if ( $has_multiple_views ) {
694
-			$args['gvid'] = gravityview_get_view_id();
694
+			$args[ 'gvid' ] = gravityview_get_view_id();
695 695
 		}
696 696
 
697 697
 		return add_query_arg( $args, $directory_link );
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
712 712
 }
713 713
 
714 714
 function gv_class( $field, $form = NULL, $entry = array() ) {
715
-	return GravityView_API::field_class( $field, $form, $entry  );
715
+	return GravityView_API::field_class( $field, $form, $entry );
716 716
 }
717 717
 
718 718
 /**
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
 		$view_id = 0;
736 736
 		if ( $context->view ) {
737 737
 			$view_id = $context->view->ID;
738
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
738
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
739 739
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
740 740
 			}
741 741
 		}
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
 		$default_css_class .= ' gv-container-no-results';
764 764
 	}
765 765
 
766
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
766
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
767 767
 
768 768
 	/**
769 769
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
 
791 791
 	$value = GravityView_API::field_value( $entry, $field );
792 792
 
793
-	if( $value === '' ) {
793
+	if ( $value === '' ) {
794 794
 		/**
795 795
 		 * @filter `gravityview_empty_value` What to display when a field is empty
796 796
 		 * @param string $value (empty string)
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
903 903
  */
904 904
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
905 905
 
906
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
906
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
907 907
 
908 908
 		// For the complete field value as generated by Gravity Forms
909 909
 		return $display_value;
@@ -937,16 +937,16 @@  discard block
 block discarded – undo
937 937
 		$terms = explode( ', ', $value );
938 938
 	}
939 939
 
940
-	foreach ($terms as $term_name ) {
940
+	foreach ( $terms as $term_name ) {
941 941
 
942 942
 		// If we're processing a category,
943
-		if( $taxonomy === 'category' ) {
943
+		if ( $taxonomy === 'category' ) {
944 944
 
945 945
 			// Use rgexplode to prevent errors if : doesn't exist
946 946
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
947 947
 
948 948
 			// The explode was succesful; we have the category ID
949
-			if( !empty( $term_id )) {
949
+			if ( ! empty( $term_id ) ) {
950 950
 				$term = get_term_by( 'id', $term_id, $taxonomy );
951 951
 			} else {
952 952
 			// We have to fall back to the name
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
959 959
 		}
960 960
 
961 961
 		// There's still a tag/category here.
962
-		if( $term ) {
962
+		if ( $term ) {
963 963
 
964 964
 			$term_link = get_term_link( $term, $taxonomy );
965 965
 
@@ -968,11 +968,11 @@  discard block
 block discarded – undo
968 968
 			    continue;
969 969
 			}
970 970
 
971
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
971
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
972 972
 		}
973 973
 	}
974 974
 
975
-	return implode(', ', $output );
975
+	return implode( ', ', $output );
976 976
 }
977 977
 
978 978
 /**
@@ -986,8 +986,8 @@  discard block
 block discarded – undo
986 986
 
987 987
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
988 988
 
989
-	if( empty( $link ) ) {
990
-		return strip_tags( $output);
989
+	if ( empty( $link ) ) {
990
+		return strip_tags( $output );
991 991
 	}
992 992
 
993 993
 	return $output;
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 	$fe = GravityView_frontend::getInstance();
1007 1007
 
1008 1008
 	// Solve problem when loading content via admin-ajax.php
1009
-	if( ! $fe->getGvOutputData() ) {
1009
+	if ( ! $fe->getGvOutputData() ) {
1010 1010
 
1011 1011
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
1012 1012
 
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 	}
1015 1015
 
1016 1016
 	// Make 100% sure that we're dealing with a properly called situation
1017
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1017
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1018 1018
 
1019 1019
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
1020 1020
 
@@ -1245,12 +1245,12 @@  discard block
 block discarded – undo
1245 1245
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1246 1246
 	/** @define "GRAVITYVIEW_DIR" "../" */
1247 1247
 
1248
-	if( !class_exists( 'GravityView_Field' ) ) {
1249
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1248
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1249
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1250 1250
 	}
1251 1251
 
1252
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1253
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1252
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1253
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1254 1254
 	}
1255 1255
 
1256 1256
 	if ( is_null( $context ) ) {
@@ -1353,21 +1353,21 @@  discard block
 block discarded – undo
1353 1353
 	} else {
1354 1354
 		// @deprecated path
1355 1355
 		// Required fields.
1356
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1356
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1357 1357
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1358 1358
 			return '';
1359 1359
 		}
1360 1360
 	}
1361 1361
 
1362 1362
 	if ( $context instanceof \GV\Template_Context ) {
1363
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1364
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1365
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1363
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1364
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1365
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1366 1366
 	} else {
1367 1367
 		// @deprecated path
1368
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1369
-		$field = $args['field'];
1370
-		$form = $args['form'];
1368
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1369
+		$field = $args[ 'field' ];
1370
+		$form = $args[ 'form' ];
1371 1371
 	}
1372 1372
 
1373 1373
 	/**
@@ -1387,43 +1387,43 @@  discard block
 block discarded – undo
1387 1387
 	);
1388 1388
 
1389 1389
 	if ( $context instanceof \GV\Template_Context ) {
1390
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1390
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1391 1391
 	} else {
1392 1392
 		// @deprecated path
1393
-		$placeholders['value'] = gv_value( $entry, $field );
1393
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1394 1394
 	}
1395 1395
 
1396 1396
 	// If the value is empty and we're hiding empty, return empty.
1397
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1397
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1398 1398
 		return '';
1399 1399
 	}
1400 1400
 
1401
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1402
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1401
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1402
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1403 1403
 	}
1404 1404
 
1405 1405
 	// Get width setting, if exists
1406
-	$placeholders['width'] = GravityView_API::field_width( $field );
1406
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1407 1407
 
1408 1408
 	// If replacing with CSS inline formatting, let's do it.
1409
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1409
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1410 1410
 
1411 1411
 	// Grab the Class using `gv_class`
1412
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1413
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1412
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1413
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1414 1414
 
1415 1415
 	if ( $context instanceof \GV\Template_Context ) {
1416
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1416
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1417 1417
 	} else {
1418 1418
 		// Default Label value
1419
-		$placeholders['label_value'] = gv_label( $field, $entry );
1419
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1420 1420
 	}
1421 1421
 
1422
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1423
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1422
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1423
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1424 1424
 
1425
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1426
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1425
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1426
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1427 1427
 	}
1428 1428
 
1429 1429
 	/**
@@ -1434,7 +1434,7 @@  discard block
 block discarded – undo
1434 1434
 	 * @since 2.0
1435 1435
 	 * @param \GV\Template_Context $context The context.
1436 1436
 	 */
1437
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1437
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1438 1438
 
1439 1439
 	/**
1440 1440
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1461,7 +1461,7 @@  discard block
 block discarded – undo
1461 1461
 	foreach ( $placeholders as $tag => $value ) {
1462 1462
 
1463 1463
 		// If the tag doesn't exist just skip it
1464
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1464
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1465 1465
 			continue;
1466 1466
 		}
1467 1467
 
Please login to merge, or discard this patch.