Completed
Pull Request — develop (#1484)
by Zack
07:48
created
includes/extensions/lightbox/class-gravityview-lightbox-provider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 		add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 3 );
24 24
 		add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
25 25
 
26
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
27
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
26
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
27
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
28 28
 
29 29
 		add_action( 'wp_footer', array( $this, 'output_footer' ) );
30 30
 	}
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 		remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 );
45 45
 		remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) );
46 46
 
47
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') );
48
-		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') );
47
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
48
+		remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
49 49
 
50 50
 		remove_action( 'wp_footer', array( $this, 'output_footer' ) );
51 51
 	}
Please login to merge, or discard this patch.
includes/extensions/lightbox/class-gravityview-lightbox.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function set_provider( $provider = null ) {
40 40
 
41
-		if( gravityview()->request->is_admin() ) {
41
+		if ( gravityview()->request->is_admin() ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		}
58 58
 
59 59
 		// We're switching providers; remove the hooks that were added.
60
-		if( self::$active_provider ) {
60
+		if ( self::$active_provider ) {
61 61
 			self::$active_provider->remove_hooks();
62 62
 		}
63 63
 
Please login to merge, or discard this patch.
lightbox/fancybox/class-gravityview-lightbox-provider-fancybox.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -102,17 +102,17 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function allowed_atts( $atts = array() ) {
104 104
 
105
-		$atts['data-fancybox']         = null;
106
-		$atts['data-fancybox-trigger'] = null;
107
-		$atts['data-fancybox-index']   = null;
108
-		$atts['data-src']              = null;
109
-		$atts['data-type']             = null;
110
-		$atts['data-width']            = null;
111
-		$atts['data-height']           = null;
112
-		$atts['data-srcset']           = null;
113
-		$atts['data-caption']          = null;
114
-		$atts['data-options']          = null;
115
-		$atts['data-filter']           = null;
105
+		$atts[ 'data-fancybox' ]         = null;
106
+		$atts[ 'data-fancybox-trigger' ] = null;
107
+		$atts[ 'data-fancybox-index' ]   = null;
108
+		$atts[ 'data-src' ]              = null;
109
+		$atts[ 'data-type' ]             = null;
110
+		$atts[ 'data-width' ]            = null;
111
+		$atts[ 'data-height' ]           = null;
112
+		$atts[ 'data-srcset' ]           = null;
113
+		$atts[ 'data-caption' ]          = null;
114
+		$atts[ 'data-options' ]          = null;
115
+		$atts[ 'data-filter' ]           = null;
116 116
 
117 117
 		return $atts;
118 118
 	}
@@ -126,14 +126,14 @@  discard block
 block discarded – undo
126 126
 			return $link_atts;
127 127
 		}
128 128
 
129
-		$link_atts['class'] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
129
+		$link_atts[ 'class' ] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
130 130
 
131
-		$link_atts['class'] = sanitize_html_class( $link_atts['class'] );
131
+		$link_atts[ 'class' ] = sanitize_html_class( $link_atts[ 'class' ] );
132 132
 
133 133
 		if ( $context && ! empty( $context->field->field ) ) {
134 134
 			if ( $context->field->field->multipleFiles ) {
135 135
 				$entry = $context->entry->as_entry();
136
-				$link_atts['data-fancybox'] = 'gallery-' . sprintf( "%s-%s-%s", $entry['form_id'], $context->field->ID, $context->entry->get_slug() );
136
+				$link_atts[ 'data-fancybox' ] = 'gallery-' . sprintf( "%s-%s-%s", $entry[ 'form_id' ], $context->field->ID, $context->entry->get_slug() );
137 137
 			}
138 138
 		}
139 139
 
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Spacing   +95 added lines, -95 removed lines patch added patch discarded remove patch
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 	private function __construct() {}
86 86
 
87 87
 	private function initialize() {
88
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
88
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
89 89
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
90
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
90
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
91 91
 
92 92
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
93 93
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -234,18 +234,18 @@  discard block
 block discarded – undo
234 234
 
235 235
 		if ( ! empty( $view_id ) ) {
236 236
 
237
-			$this->context_view_id = (int) $view_id;
237
+			$this->context_view_id = (int)$view_id;
238 238
 
239
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
239
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
240 240
 			/**
241 241
 			 * used on a has_multiple_views context
242 242
 			 * @see GravityView_API::entry_link
243 243
 			 */
244
-			$this->context_view_id = (int) $_GET['gvid'];
244
+			$this->context_view_id = (int)$_GET[ 'gvid' ];
245 245
 
246 246
 		} elseif ( ! $multiple_views ) {
247 247
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
248
-			$this->context_view_id = (int) array_pop( $array_keys );
248
+			$this->context_view_id = (int)array_pop( $array_keys );
249 249
 			unset( $array_keys );
250 250
 		}
251 251
 
@@ -278,25 +278,25 @@  discard block
 block discarded – undo
278 278
 		global $wp_rewrite;
279 279
 
280 280
 		$is_front_page = ( $query->is_home || $query->is_page );
281
-		$show_on_front = ( 'page' === get_option('show_on_front') );
282
-		$front_page_id = get_option('page_on_front');
281
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
282
+		$front_page_id = get_option( 'page_on_front' );
283 283
 
284
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
284
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
285 285
 
286 286
 			// Force to be an array, potentially a query string ( entry=16 )
287 287
 			$_query = wp_parse_args( $query->query );
288 288
 
289 289
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
290
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
291
-				unset( $_query['pagename'] );
290
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
291
+				unset( $_query[ 'pagename' ] );
292 292
 			}
293 293
 
294 294
 			// this is where will break from core wordpress
295 295
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
296 296
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
297 297
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
298
-			foreach ( (array) $endpoints as $endpoint ) {
299
-				$ignore[] = $endpoint[1];
298
+			foreach ( (array)$endpoints as $endpoint ) {
299
+				$ignore[ ] = $endpoint[ 1 ];
300 300
 			}
301 301
 			unset( $endpoints );
302 302
 
@@ -306,21 +306,21 @@  discard block
 block discarded – undo
306 306
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
307 307
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
308 308
 
309
-				$qv =& $query->query_vars;
309
+				$qv = & $query->query_vars;
310 310
 
311 311
 				// Prevent redirect when on the single entry endpoint
312
-				if( self::is_single_entry() ) {
312
+				if ( self::is_single_entry() ) {
313 313
 					add_filter( 'redirect_canonical', '__return_false' );
314 314
 				}
315 315
 
316 316
 				$query->is_page = true;
317 317
 				$query->is_home = false;
318
-				$qv['page_id']  = $front_page_id;
318
+				$qv[ 'page_id' ]  = $front_page_id;
319 319
 
320 320
 				// Correct <!--nextpage--> for page_on_front
321
-				if ( ! empty( $qv['paged'] ) ) {
322
-					$qv['page'] = $qv['paged'];
323
-					unset( $qv['paged'] );
321
+				if ( ! empty( $qv[ 'paged' ] ) ) {
322
+					$qv[ 'page' ] = $qv[ 'paged' ];
323
+					unset( $qv[ 'paged' ] );
324 324
 				}
325 325
 			}
326 326
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 
351 351
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
352 352
 
353
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
353
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
354 354
 		$this->setPostId( $post_id );
355 355
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
356 356
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
388 388
 
389
-		if( 'post' === $search_method ) {
389
+		if ( 'post' === $search_method ) {
390 390
 			$get = $_POST;
391 391
 		} else {
392 392
 			$get = $_GET;
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		$gventry = gravityview()->request->is_entry();
439 439
 
440 440
 		// If this is the directory view, return.
441
-		if( ! $gventry ) {
441
+		if ( ! $gventry ) {
442 442
 			return $passed_title;
443 443
 		}
444 444
 
@@ -456,19 +456,19 @@  discard block
 block discarded – undo
456 456
 		}
457 457
 
458 458
 		// WooCommerce doesn't $post_id
459
-		if ( empty( $passed_post_id ) )  {
459
+		if ( empty( $passed_post_id ) ) {
460 460
 			return $passed_title;
461 461
 		}
462 462
 
463 463
 		// Don't modify the title for anything other than the current view/post.
464 464
 		// This is true for embedded shortcodes and Views.
465
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
465
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
466 466
 			return $passed_title;
467 467
 		}
468 468
 
469 469
 		$view = gravityview()->request->is_view();
470 470
 
471
-		if( $view ) {
471
+		if ( $view ) {
472 472
 			return $this->_get_single_entry_title( $view, $entry, $passed_title );
473 473
 		}
474 474
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 		$view_collection = \GV\View_Collection::from_post( $post );
492 492
 
493 493
 		// We have multiple Views, but no gvid...this isn't valid security
494
-		if( 1 < $view_collection->count() ) {
494
+		if ( 1 < $view_collection->count() ) {
495 495
 			return $passed_title;
496 496
 		}
497 497
 
@@ -525,18 +525,18 @@  discard block
 block discarded – undo
525 525
 		 */
526 526
 		$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view );
527 527
 
528
-		if( $check_entry_display ) {
528
+		if ( $check_entry_display ) {
529 529
 
530 530
 			$check_display = GVCommon::check_entry_display( $entry, $view );
531 531
 
532
-			if( is_wp_error( $check_display ) ) {
532
+			if ( is_wp_error( $check_display ) ) {
533 533
 				return $passed_title;
534 534
 			}
535 535
 		}
536 536
 
537 537
 		$title = $view->settings->get( 'single_title', $passed_title );
538 538
 
539
-		$form = GVCommon::get_form( $entry['form_id'] );
539
+		$form = GVCommon::get_form( $entry[ 'form_id' ] );
540 540
 
541 541
 		// We are allowing HTML in the fields, so no escaping the output
542 542
 		$title = GravityView_API::replace_variables( $title, $form, $entry );
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
 
609 609
 		$context = GravityView_View::getInstance()->getContext();
610 610
 
611
-		switch( $context ) {
611
+		switch ( $context ) {
612 612
 			case 'directory':
613 613
 				$tab = __( 'Multiple Entries', 'gravityview' );
614 614
 				break;
@@ -622,12 +622,12 @@  discard block
 block discarded – undo
622 622
 		}
623 623
 
624 624
 
625
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
625
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
626 626
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
627
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
627
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
628 628
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
629 629
 
630
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
630
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
631 631
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
632 632
 
633 633
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
676 676
 		$embed_only = $view->settings->get( 'embed_only' );
677 677
 
678
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
678
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
679 679
 			return __( 'You are not allowed to view this content.', 'gravityview' );
680 680
 		}
681 681
 
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
 				$datetime_format = 'Y-m-d H:i:s';
723 723
 				$search_is_outside_view_bounds = false;
724 724
 
725
-				if( ! empty( $search_criteria[ $key ] ) ) {
725
+				if ( ! empty( $search_criteria[ $key ] ) ) {
726 726
 
727 727
 					$search_date = strtotime( $search_criteria[ $key ] );
728 728
 
@@ -750,14 +750,14 @@  discard block
 block discarded – undo
750 750
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
751 751
 
752 752
 					// Then we override the search and re-set the start date
753
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
753
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
754 754
 				}
755 755
 			}
756 756
 		}
757 757
 
758
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
758
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
759 759
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
760
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
760
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
761 761
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
762 762
 			}
763 763
 		}
@@ -776,19 +776,19 @@  discard block
 block discarded – undo
776 776
 	public static function process_search_only_approved( $args, $search_criteria ) {
777 777
 
778 778
 		/** @since 1.19 */
779
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
779
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
780 780
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
781 781
 			return $search_criteria;
782 782
 		}
783 783
 
784
-		if ( ! empty( $args['show_only_approved'] ) ) {
784
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
785 785
 
786
-			$search_criteria['field_filters'][] = array(
786
+			$search_criteria[ 'field_filters' ][ ] = array(
787 787
 				'key' => GravityView_Entry_Approval::meta_key,
788 788
 				'value' => GravityView_Entry_Approval_Status::APPROVED
789 789
 			);
790 790
 
791
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
791
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
792 792
 
793 793
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
794 794
 		}
@@ -815,18 +815,18 @@  discard block
 block discarded – undo
815 815
 	 */
816 816
 	public static function is_entry_approved( $entry, $args = array() ) {
817 817
 
818
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
818
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
819 819
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
820 820
 			return true;
821 821
 		}
822 822
 
823 823
 		/** @since 1.19 */
824
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
824
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
825 825
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
826 826
 			return true;
827 827
 		}
828 828
 
829
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
829
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
830 830
 
831 831
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
832 832
 	}
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
851 851
 		 */
852 852
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
853
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
853
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
854 854
 
855 855
 		/**
856 856
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -870,29 +870,29 @@  discard block
 block discarded – undo
870 870
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
871 871
 
872 872
 		// implicity search
873
-		if ( ! empty( $args['search_value'] ) ) {
873
+		if ( ! empty( $args[ 'search_value' ] ) ) {
874 874
 
875 875
 			// Search operator options. Options: `is` or `contains`
876
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
876
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
877 877
 
878
-			$search_criteria['field_filters'][] = array(
878
+			$search_criteria[ 'field_filters' ][ ] = array(
879 879
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
880
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
880
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
881 881
 				'operator' => $operator,
882 882
 			);
883 883
 
884 884
 			// Lock search mode to "all" with implicit presearch filter.
885
-			$search_criteria['field_filters']['mode'] = 'all';
885
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
886 886
 		}
887 887
 
888
-		if( $search_criteria !== $original_search_criteria ) {
888
+		if ( $search_criteria !== $original_search_criteria ) {
889 889
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
890 890
 		}
891 891
 
892 892
 		// Handle setting date range
893 893
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
894 894
 
895
-		if( $search_criteria !== $original_search_criteria ) {
895
+		if ( $search_criteria !== $original_search_criteria ) {
896 896
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
897 897
 		}
898 898
 
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
903 903
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
904 904
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
905 905
 		 */
906
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
906
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
907 907
 
908 908
 		return $search_criteria;
909 909
 	}
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
 			'search_criteria' => $search_criteria,
1017 1017
 			'sorting' => self::updateViewSorting( $args, $form_id ),
1018 1018
 			'paging' => $paging,
1019
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
1019
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
1020 1020
 		);
1021 1021
 
1022 1022
 		/**
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
1042 1042
 		 * @param array $args View configuration args.
1043 1043
 		 */
1044
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1044
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1045 1045
 
1046 1046
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
1047 1047
 
@@ -1066,17 +1066,17 @@  discard block
 block discarded – undo
1066 1066
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
1067 1067
 
1068 1068
 		// Paging & offset
1069
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
1069
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
1070 1070
 
1071 1071
 		if ( -1 === $page_size ) {
1072 1072
 			$page_size = PHP_INT_MAX;
1073 1073
 		}
1074 1074
 
1075
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
1075
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
1076 1076
 		$offset = ( $curr_page - 1 ) * $page_size;
1077 1077
 
1078
-		if ( ! empty( $args['offset'] ) ) {
1079
-			$offset += intval( $args['offset'] );
1078
+		if ( ! empty( $args[ 'offset' ] ) ) {
1079
+			$offset += intval( $args[ 'offset' ] );
1080 1080
 		}
1081 1081
 
1082 1082
 		$paging = array(
@@ -1101,11 +1101,11 @@  discard block
 block discarded – undo
1101 1101
 	public static function updateViewSorting( $args, $form_id ) {
1102 1102
 		$sorting = array();
1103 1103
 
1104
-		$has_values = isset( $_GET['sort'] );
1104
+		$has_values = isset( $_GET[ 'sort' ] );
1105 1105
 
1106
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
1107
-			$sorts = array_keys( $_GET['sort'] );
1108
-			$dirs  = array_values( $_GET['sort'] );
1106
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
1107
+			$sorts = array_keys( $_GET[ 'sort' ] );
1108
+			$dirs  = array_values( $_GET[ 'sort' ] );
1109 1109
 
1110 1110
 			if ( $has_values = array_filter( $dirs ) ) {
1111 1111
 				$sort_field_id = end( $sorts );
@@ -1114,11 +1114,11 @@  discard block
 block discarded – undo
1114 1114
 		}
1115 1115
 
1116 1116
 		if ( ! isset( $sort_field_id ) ) {
1117
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
1117
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
1118 1118
 		}
1119 1119
 
1120 1120
 		if ( ! isset( $sort_direction ) ) {
1121
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
1121
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
1122 1122
 		}
1123 1123
 
1124 1124
 		if ( is_array( $sort_field_id ) ) {
@@ -1150,10 +1150,10 @@  discard block
 block discarded – undo
1150 1150
 				$form = GFAPI::get_form( $form_id );
1151 1151
 
1152 1152
 				// Get the first GF_Field field ID, set as the key for entry randomization
1153
-				if ( ! empty( $form['fields'] ) ) {
1153
+				if ( ! empty( $form[ 'fields' ] ) ) {
1154 1154
 
1155 1155
 					/** @var GF_Field $field */
1156
-					foreach ( $form['fields'] as $field ) {
1156
+					foreach ( $form[ 'fields' ] as $field ) {
1157 1157
 						if ( ! is_a( $field, 'GF_Field' ) ) {
1158 1158
 							continue;
1159 1159
 						}
@@ -1198,7 +1198,7 @@  discard block
 block discarded – undo
1198 1198
 		if ( is_array( $sort_field_id ) ) {
1199 1199
 			$modified_ids = array();
1200 1200
 			foreach ( $sort_field_id as $_sort_field_id ) {
1201
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1201
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1202 1202
 			}
1203 1203
 			return $modified_ids;
1204 1204
 		}
@@ -1207,11 +1207,11 @@  discard block
 block discarded – undo
1207 1207
 
1208 1208
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1209 1209
 
1210
-		if( ! $sort_field ) {
1210
+		if ( ! $sort_field ) {
1211 1211
 			return $sort_field_id;
1212 1212
 		}
1213 1213
 
1214
-		switch ( $sort_field['type'] ) {
1214
+		switch ( $sort_field[ 'type' ] ) {
1215 1215
 
1216 1216
 			case 'address':
1217 1217
 				// Sorting by full address
@@ -1228,7 +1228,7 @@  discard block
 block discarded – undo
1228 1228
 					 */
1229 1229
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1230 1230
 
1231
-					switch( strtolower( $address_part ) ){
1231
+					switch ( strtolower( $address_part ) ) {
1232 1232
 						case 'street':
1233 1233
 							$sort_field_id .= '.1';
1234 1234
 							break;
@@ -1301,7 +1301,7 @@  discard block
 block discarded – undo
1301 1301
 		if ( ! class_exists( '\GV\Entry' ) ) {
1302 1302
 
1303 1303
 			// Not using gravityview()->log->error(), since that may not exist yet either!
1304
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
1304
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
1305 1305
 
1306 1306
 			return null;
1307 1307
 		}
@@ -1318,7 +1318,7 @@  discard block
 block discarded – undo
1318 1318
 		 */
1319 1319
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1320 1320
 
1321
-		if ( empty( $single_entry ) ){
1321
+		if ( empty( $single_entry ) ) {
1322 1322
 			return false;
1323 1323
 		} else {
1324 1324
 			return $single_entry;
@@ -1340,7 +1340,7 @@  discard block
 block discarded – undo
1340 1340
 			$views = $this->getGvOutputData()->get_views();
1341 1341
 
1342 1342
 			foreach ( $views as $view_id => $data ) {
1343
-				$view = \GV\View::by_id( $data['id'] );
1343
+				$view = \GV\View::by_id( $data[ 'id' ] );
1344 1344
 				$view_id = $view->ID;
1345 1345
 				$template_id = gravityview_get_template_id( $view->ID );
1346 1346
 				$data = $view->as_data();
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
1349 1349
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1350 1350
 				 * @since 1.15
1351 1351
 				 */
1352
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1352
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1353 1353
 					continue;
1354 1354
 				}
1355 1355
 
@@ -1378,7 +1378,7 @@  discard block
 block discarded – undo
1378 1378
 					 * @param \GV\View The View.
1379 1379
 					 */
1380 1380
 					$js_dependency = apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
1381
-					$js_dependencies[] = $js_dependency;
1381
+					$js_dependencies[ ] = $js_dependency;
1382 1382
 
1383 1383
 					/**
1384 1384
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
@@ -1394,7 +1394,7 @@  discard block
 block discarded – undo
1394 1394
 					 * @param \GV\View The View.
1395 1395
 					 */
1396 1396
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
1397
-					$css_dependencies[] = $css_dependency;
1397
+					$css_dependencies[ ] = $css_dependency;
1398 1398
 				}
1399 1399
 
1400 1400
 				/**
@@ -1402,19 +1402,19 @@  discard block
 block discarded – undo
1402 1402
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1403 1403
 				 * @since 1.15
1404 1404
 				 */
1405
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1406
-					$css_dependencies[] = 'dashicons';
1405
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1406
+					$css_dependencies[ ] = 'dashicons';
1407 1407
 				}
1408 1408
 
1409 1409
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1410 1410
 
1411 1411
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1412 1412
 
1413
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
1413
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
1414 1414
 
1415 1415
 				wp_enqueue_script( 'gravityview-fe-view' );
1416 1416
 
1417
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1417
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1418 1418
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1419 1419
 				}
1420 1420
 
@@ -1477,7 +1477,7 @@  discard block
 block discarded – undo
1477 1477
 	public static function add_style( $template_id ) {
1478 1478
 
1479 1479
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
1480
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1480
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1481 1481
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
1482 1482
 		} elseif ( empty( $template_id ) ) {
1483 1483
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1508,11 +1508,11 @@  discard block
 block discarded – undo
1508 1508
 		 * Not a table-based template; don't add sort icons
1509 1509
 		 * @since 1.12
1510 1510
 		 */
1511
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1511
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1512 1512
 			return $label;
1513 1513
 		}
1514 1514
 
1515
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1515
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1516 1516
 			return $label;
1517 1517
 		}
1518 1518
 
@@ -1520,29 +1520,29 @@  discard block
 block discarded – undo
1520 1520
 
1521 1521
 		$class = 'gv-sort';
1522 1522
 
1523
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1523
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1524 1524
 
1525 1525
 		$sort_args = array(
1526
-			'sort' => $field['id'],
1526
+			'sort' => $field[ 'id' ],
1527 1527
 			'dir' => 'asc',
1528 1528
 		);
1529 1529
 
1530
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1530
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1531 1531
 			//toggle sorting direction.
1532
-			if ( 'asc' === $sorting['direction'] ) {
1533
-				$sort_args['dir'] = 'desc';
1532
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1533
+				$sort_args[ 'dir' ] = 'desc';
1534 1534
 				$class .= ' gv-icon-sort-desc';
1535 1535
 			} else {
1536
-				$sort_args['dir'] = 'asc';
1536
+				$sort_args[ 'dir' ] = 'asc';
1537 1537
 				$class .= ' gv-icon-sort-asc';
1538 1538
 			}
1539 1539
 		} else {
1540 1540
 			$class .= ' gv-icon-caret-up-down';
1541 1541
 		}
1542 1542
 
1543
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1543
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1544 1544
 
1545
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1545
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1546 1546
 
1547 1547
 	}
1548 1548
 
@@ -1560,7 +1560,7 @@  discard block
 block discarded – undo
1560 1560
 
1561 1561
 		$field_type = $field_id;
1562 1562
 
1563
-		if( is_numeric( $field_id ) ) {
1563
+		if ( is_numeric( $field_id ) ) {
1564 1564
 			$field = GFFormsModel::get_field( $form, $field_id );
1565 1565
 			$field_type = $field ? $field->type : $field_id;
1566 1566
 		}
@@ -1583,7 +1583,7 @@  discard block
 block discarded – undo
1583 1583
 			return false;
1584 1584
 		}
1585 1585
 
1586
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1586
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1587 1587
 
1588 1588
 	}
1589 1589
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -24,21 +24,21 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
40 40
 
41
-		$add_options['image_width'] = array(
41
+		$add_options[ 'image_width' ] = array(
42 42
 			'type' => 'text',
43 43
 			'label' => __( 'Custom Width:', 'gravityview' ),
44 44
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
 			$base_id = null;
128 128
 
129 129
 			$is_single = gravityview_get_context() === 'single';
130
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
130
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
131 131
 			$field_compat = $gravityview_view->getCurrentField();
132 132
 		}
133 133
 
134 134
 		$output_arr = array();
135 135
 
136 136
 		// Get an array of file paths for the field.
137
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
137
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
138 138
 
139 139
 		// The $value JSON was probably truncated; let's check lead_detail_long.
140 140
 		if ( ! is_array( $file_paths ) ) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			$rendered = null;
154 154
 
155 155
 			// If the site is HTTPS, use HTTPS
156
-			if ( function_exists('set_url_scheme') ) {
156
+			if ( function_exists( 'set_url_scheme' ) ) {
157 157
 				$file_path = set_url_scheme( $file_path );
158 158
 			}
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 			$file_path_info = pathinfo( $file_path );
165 165
 
166 166
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
167
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
168
-			$basename = $file_path_info['basename'];
167
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
168
+			$basename = $file_path_info[ 'basename' ];
169 169
 
170 170
 			// Get the secure download URL
171 171
 			$is_secure = false;
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 					 */
205 205
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
206 206
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
207
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
207
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
208 208
 					), $context );
209 209
 
210 210
 					/**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 					 */
241 241
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
242 242
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
243
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
243
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
244 244
 					), $context );
245 245
 
246 246
 					/**
@@ -273,13 +273,13 @@  discard block
 block discarded – undo
273 273
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
274 274
 				$image_atts = array(
275 275
 					'src'   => $file_path,
276
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
277
-					'alt'   => $field_settings['label'],
278
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
276
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
277
+					'alt'   => $field_settings[ 'label' ],
278
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
279 279
 				);
280 280
 
281 281
 				if ( $is_secure ) {
282
-					$image_atts['validate_src'] = false;
282
+					$image_atts[ 'validate_src' ] = false;
283 283
 				}
284 284
 
285 285
 				/**
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 
301 301
 				unset( $gv_entry );
302 302
 
303
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
303
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
304 304
 					$lightbox_link_atts = array(
305 305
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
306 306
 						'class' => '',
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 
309 309
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
310 310
 
311
-					$image_atts['src'] = $insecure_file_path;
311
+					$image_atts[ 'src' ] = $insecure_file_path;
312 312
 					$image = new GravityView_Image( $image_atts );
313 313
 					$file_path = $insecure_file_path;
314 314
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 				}
319 319
 
320 320
 				// Show as link should render the image regardless.
321
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
321
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
322 322
 					$text = $rendered;
323 323
 				}
324 324
 			}
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
336 336
 
337 337
 			// Output textualized content where
338
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
338
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
339 339
 				/**
340 340
 				 * Modify the link text (defaults to the file name)
341 341
 				 *
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 				 */
349 349
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
350 350
 
351
-				if ( empty( $field_settings['show_as_link'] ) ) {
351
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
352 352
 					/**
353 353
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
354 354
 					 * @param array|string $link_atts Array or attributes string
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 				$content = empty( $rendered ) ? $text : $rendered;
365 365
 			}
366 366
 
367
-			$output_arr[] = array(
367
+			$output_arr[ ] = array(
368 368
 				'file_path' => $file_path,
369 369
 				'content' => $content
370 370
 			);
Please login to merge, or discard this patch.