gravityview / GravityView

future/includes/class-gv-view.php

Spacing +82 added lines, -83 removed lines

@@ -125,7 +125,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -234,12 +234,12 @@ 
 		$tsv_rule = array( sprintf( '%s/([^/]+)/tsv/?', $slug ), 'index.php?gravityview=$matches[1]&tsv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) {
-			$query_vars[] = 'csv';
-			$query_vars[] = 'tsv';
+			$query_vars[ ] = 'csv';
+			$query_vars[ ] = 'tsv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $csv_rule );
 			call_user_func_array( 'add_rewrite_rule', $tsv_rule );
 		}
@@ -300,7 +300,7 @@ 
 
 						$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-						$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
+						$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
 
 						return \GVCommon::generate_notice( '<h3>' . $title . '</h3>' . wpautop( $message . $image ), 'notice' );
 					}
@@ -326,13 +326,13 @@ 
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -343,7 +343,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -366,7 +366,7 @@ 
 
 			foreach ( $entryset as $e ) {
 
-				if ( 'active' !== $e['status'] ) {
+				if ( 'active' !== $e[ 'status' ] ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -377,7 +377,7 @@ 
 				}
 
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return __( 'You are not allowed to view this content.', 'gravityview' );
 					}
@@ -552,7 +552,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -642,13 +642,13 @@ 
 			}
 
 			foreach ( $_fields as $field ) {
-				if ( ! empty( $field['unions'] ) ) {
-					foreach ( $field['unions'] as $form_id => $field_id ) {
+				if ( ! empty( $field[ 'unions' ] ) ) {
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
 						if ( ! isset( $unions[ $form_id ] ) ) {
 							$unions[ $form_id ] = array();
 						}
 
-						$unions[ $form_id ][ $field['id'] ] =
+						$unions[ $form_id ][ $field[ 'id' ] ] =
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
 					}
 				}
@@ -703,7 +703,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -936,7 +936,7 @@ 
 	public function get_entries( $request = null ) {
 		static $entries;
 
-		if( $entries && ! gravityview()->request->is_entry() ) {
+		if ( $entries && ! gravityview()->request->is_entry() ) {
 			return $entries;
 		}
 
@@ -953,11 +953,11 @@ 
 		 * Remove multiple sorting before calling legacy filters.
 		 * This allows us to fake it till we make it.
 		 */
-		if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+		if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 			$has_multisort = true;
-			$parameters['sort_field'] = reset( $parameters['sort_field'] );
-			if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-				$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+			$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+			if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+				$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 			}
 		}
 
@@ -966,31 +966,30 @@ 
 		 */
 		$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
 
-		$parameters['context_view_id'] = $this->ID;
+		$parameters[ 'context_view_id' ] = $this->ID;
 		$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 		if ( ! is_array( $parameters ) ) {
 			$parameters = array();
 		}
 
-		if ( ! is_array( $parameters['search_criteria'] ) ) {
-			$parameters['search_criteria'] = array();
+		if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
+			$parameters[ 'search_criteria' ] = array();
 		}
 
-		if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
-			$parameters['search_criteria']['field_filters'] = array();
+		if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
 		}
 
 		if ( $request instanceof REST\Request ) {
 			$atts = $this->settings->as_atts();
 			$paging_parameters = wp_parse_args( $request->get_paging(), array(
-					'paging' => array( 'page_size' => $atts['page_size'] ),
+					'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 				) );
-			$parameters['paging'] = $paging_parameters['paging'];
+			$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 		}
 
-		$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-			: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
+		$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
 
 		/**
 		 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -998,14 +997,14 @@ 
 		$unique_field_filters = array();
 		foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) {
 			if ( 'mode' === $key ) {
-				$unique_field_filters['mode'] = $filter;
+				$unique_field_filters[ 'mode' ] = $filter;
 			} else if ( ! in_array( $filter, $unique_field_filters ) ) {
-				$unique_field_filters[] = $filter;
+				$unique_field_filters[ ] = $filter;
 			}
 		}
-		$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+		$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-		if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
+		if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
 			gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
 		}
 
@@ -1014,7 +1013,7 @@ 
 			$query_class = $this->get_query_class();
 
 			/** @type \GF_Query $query */
-			$query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) );
+			$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
 
 			/**
 			 * Apply multisort.
@@ -1025,15 +1024,15 @@ 
 				$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
 				$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
 
-				$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
+				$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
 
-				if( $has_sort_query_param ) {
-					$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
+				if ( $has_sort_query_param ) {
+					$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
 				}
 
 				if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
-					$sort_field_ids = array_keys( $_GET['sort'] );
-					$sort_directions = array_values( $_GET['sort'] );
+					$sort_field_ids = array_keys( $_GET[ 'sort' ] );
+					$sort_directions = array_values( $_GET[ 'sort' ] );
 				} else {
 					$sort_field_ids = $view_setting_sort_field_ids;
 					$sort_directions = $view_setting_sort_directions;
@@ -1041,7 +1040,7 @@ 
 
 				$skip_first = false;
 
-				foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
+				foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
 
 					if ( ! $skip_first && ! $has_sort_query_param ) {
 						$skip_first = true; // Skip the first one, it's already in the query
@@ -1071,18 +1070,18 @@ 
 
 				$merged_time = false;
 
-				foreach ( $q['order'] as $oid => $order ) {
+				foreach ( $q[ 'order' ] as $oid => $order ) {
 
 					$column = null;
 
-					if ( $order[0] instanceof \GF_Query_Column ) {
-						$column = $order[0];
-					} else if ( $order[0] instanceof \GF_Query_Call ) {
-						if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
+					if ( $order[ 0 ] instanceof \GF_Query_Column ) {
+						$column = $order[ 0 ];
+					} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
+						if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
 							$orders[ $oid ] = $order;
 							continue; // Need something that resembles a single sort
 						}
-						$column = $order[0]->columns[0];
+						$column = $order[ 0 ]->columns[ 0 ];
 					}
 
 					if ( ! $column || ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1096,7 +1095,7 @@ 
 
 					$orders[ $oid ] = array(
 						new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
-						$order[1] // Mock it!
+						$order[ 1 ] // Mock it!
 					);
 
 					$merged_time = true;
@@ -1107,15 +1106,15 @@ 
 					 * ORDER again.
 					 */
 					if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
-						$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
+						$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
 					}
 				}
 
 				return $sql;
 			} );
 
-			$query->limit( $parameters['paging']['page_size'] )
-				->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+			$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+				->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 			/**
 			 * Any joins?
@@ -1138,7 +1137,7 @@ 
 
 						$query_parameters = $query->_introspect();
 
-						$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 					}
 
 					/**
@@ -1172,7 +1171,7 @@ 
 					}
 
 					$q = $query->_introspect();
-					$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
+					$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
 					if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
@@ -1197,7 +1196,7 @@ 
 
 						$query_parameters = $query->_introspect();
 
-						$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 					}
 				}
 
@@ -1221,7 +1220,7 @@ 
 						$conditions = array();
 
 						foreach ( $condition->expressions as $_condition ) {
-							$conditions[] = $recurse( $_condition, $fields, $recurse );
+							$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 						}
 
 						return call_user_func_array(
@@ -1250,10 +1249,10 @@ 
 					$q = new $query_class( $form_id );
 
 					// Copy the WHERE clauses but substitute the field_ids to the respective ones
-					$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
+					$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
 					// Copy the ORDER clause and substitute the field_ids to the respective ones
-					foreach ( $query_parameters['order'] as $order ) {
+					foreach ( $query_parameters[ 'order' ] as $order ) {
 						list( $column, $_order ) = $order;
 
 						if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1267,15 +1266,15 @@ 
 
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-						$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+						$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 						// Record the SQL
-						$unions_sql[] = array(
+						$unions_sql[ ] = array(
 							// Remove columns, we'll rebuild them
 							'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
-							'from'    => $sql['from'],
-							'join'    => $sql['join'],
-							'where'   => $sql['where'],
+							'from'    => $sql[ 'from' ],
+							'join'    => $sql[ 'join' ],
+							'where'   => $sql[ 'where' ],
 							// Remove order and limit
 						);
 
@@ -1292,11 +1291,11 @@ 
 
 				add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
 					// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-					$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+					$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 					// Remove columns, we'll rebuild them
-					preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
-					$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
+					preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+					$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
 					$unions = array();
 
@@ -1307,30 +1306,30 @@ 
 					};
 
 					// Add all the order columns into the selects, so we can order by the whole union group
-					preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
+					preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 
 					$columns = array(
-						sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
+						sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
 					);
 
 					foreach ( array_slice( $order_matches, 1 ) as $match ) {
-						$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
+						$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
 						// Rewrite the order columns to the shared aliases
-						$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
+						$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
 					}
 
 					$columns = array_unique( $columns );
 
 					// Add the columns to every UNION
 					foreach ( $unions_sql as $union_sql ) {
-						$union_sql['select'] .= implode( ', ', $columns );
-						$unions []= implode( ' ', $union_sql );
+						$union_sql[ 'select' ] .= implode( ', ', $columns );
+						$unions [ ] = implode( ' ', $union_sql );
 					}
 
 					// Add the columns to the main SELECT, but only grab the entry id column
-					$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
-					$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
+					$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+					$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
 					return $sql;
 				} );
@@ -1375,20 +1374,20 @@ 
 			} );
 		} else {
 			$entries = $this->form->entries
-				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 				->offset( $this->settings->get( 'offset' ) )
-				->limit( $parameters['paging']['page_size'] )
+				->limit( $parameters[ 'paging' ][ 'page_size' ] )
 				->page( $page );
 
-			if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
+			if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
 				// Pluck off multisort arrays
-				$parameters['sorting'] = $parameters['sorting'][0];
+				$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
 			}
 
-			if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+			if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 				$field = new \GV\Field();
-				$field->ID = $parameters['sorting']['key'];
-				$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+				$field->ID = $parameters[ 'sorting' ][ 'key' ];
+				$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 				$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 			}
 		}
@@ -1472,7 +1471,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1494,17 +1493,17 @@ 
 			} );
 
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 			}
 
 			foreach ( $allowed as $field ) {
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
 				if ( ! $headers_done ) {
 					$label = $field->get_label( $view, $source, $entry );
-					$headers[] = $label ? $label : $field->ID;
+					$headers[ ] = $label ? $label : $field->ID;
 				}
 			}