Completed
Push — develop ( 7b17a3...1fd3e1 )
by Zack
11:42
created
future/includes/class-gv-view.php 1 patch
Spacing   +66 added lines, -67 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$supports = array( 'title', 'revisions' );
126 126
 
127 127
 		if ( $is_hierarchical ) {
128
-			$supports[] = 'page-attributes';
128
+			$supports[ ] = 'page-attributes';
129 129
 		}
130 130
 
131 131
 		/**
@@ -227,11 +227,11 @@  discard block
 block discarded – undo
227 227
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
228 228
 
229 229
 		add_filter( 'query_vars', function( $query_vars ) { 
230
-			$query_vars[] = 'csv';
230
+			$query_vars[ ] = 'csv';
231 231
 			return $query_vars;
232 232
 		} );
233 233
 
234
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
234
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
235 235
 			call_user_func_array( 'add_rewrite_rule', $rule );
236 236
 		}
237 237
 	}
@@ -300,13 +300,13 @@  discard block
 block discarded – undo
300 300
 			return $content;
301 301
 		}
302 302
 
303
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
303
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
304 304
 
305 305
 		/**
306 306
 		 * Editing a single entry.
307 307
 		 */
308 308
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
309
-			if ( $entry['status'] != 'active' ) {
309
+			if ( $entry[ 'status' ] != 'active' ) {
310 310
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
311 311
 				return __( 'You are not allowed to view this content.', 'gravityview' );
312 312
 			}
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 			}
318 318
 
319 319
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
320
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
320
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
321 321
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
322 322
 					return __( 'You are not allowed to view this content.', 'gravityview' );
323 323
 				}
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 
341 341
 			foreach ( $entryset as $e ) {
342 342
 
343
-				if ( 'active' !== $e['status'] ) {
343
+				if ( 'active' !== $e[ 'status' ] ) {
344 344
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
345 345
 					return __( 'You are not allowed to view this content.', 'gravityview' );
346 346
 				}
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 				}
352 352
 
353 353
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
354
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
354
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
355 355
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
356 356
 						return __( 'You are not allowed to view this content.', 'gravityview' );
357 357
 					}
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
527 527
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
528 528
 
529
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
529
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
530 530
 		}
531 531
 
532 532
 		return $joins;
@@ -621,13 +621,13 @@  discard block
 block discarded – undo
621 621
 			}
622 622
 
623 623
 			foreach ( $_fields as $field ) {
624
-				if ( ! empty( $field['unions'] ) ) {
625
-					foreach ( $field['unions'] as $form_id => $field_id ) {
624
+				if ( ! empty( $field[ 'unions' ] ) ) {
625
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
626 626
 						if ( ! isset( $unions[ $form_id ] ) ) {
627 627
 							$unions[ $form_id ] = array();
628 628
 						}
629 629
 
630
-						$unions[ $form_id ][ $field['id'] ] =
630
+						$unions[ $form_id ][ $field[ 'id' ] ] =
631 631
 							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 );
632 632
 					}
633 633
 				}
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 		if ( ! $view->form ) {
677 677
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
678 678
 				'view_id' => $view->ID,
679
-				'form_id' => $view->_gravityview_form_id ? : 0,
679
+				'form_id' => $view->_gravityview_form_id ?: 0,
680 680
 			) );
681 681
 		}
682 682
 
@@ -913,11 +913,11 @@  discard block
 block discarded – undo
913 913
 			 * Remove multiple sorting before calling legacy filters.
914 914
 			 * This allows us to fake it till we make it.
915 915
 			 */
916
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
916
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
917 917
 				$has_multisort = true;
918
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
919
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
920
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
918
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
919
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
920
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
921 921
 				}
922 922
 			}
923 923
 
@@ -925,40 +925,39 @@  discard block
 block discarded – undo
925 925
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
926 926
 			 */
927 927
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
928
-			$parameters['context_view_id'] = $this->ID;
928
+			$parameters[ 'context_view_id' ] = $this->ID;
929 929
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
930 930
 
931 931
 			if ( $request instanceof REST\Request ) {
932 932
 				$atts = $this->settings->as_atts();
933 933
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
934
-						'paging' => array( 'page_size' => $atts['page_size'] ),
934
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
935 935
 					) );
936
-				$parameters['paging'] = $paging_parameters['paging'];
936
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
937 937
 			}
938 938
 
939
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
940
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
939
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
941 940
 
942 941
 			/**
943 942
 			 * Cleanup duplicate field_filter parameters to simplify the query.
944 943
 			 */
945 944
 			$unique_field_filters = array();
946
-			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) {
945
+			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) {
947 946
 				if ( 'mode' === $key ) {
948
-					$unique_field_filters['mode'] = $filter;
947
+					$unique_field_filters[ 'mode' ] = $filter;
949 948
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
950
-					$unique_field_filters[] = $filter;
949
+					$unique_field_filters[ ] = $filter;
951 950
 				}
952 951
 			}
953
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
952
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
954 953
 
955
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
954
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
956 955
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
957 956
 			}
958 957
 
959 958
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
960 959
 				$query_class = $this->get_query_class();
961
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
960
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
962 961
 
963 962
 				/**
964 963
 				 * Apply multisort.
@@ -966,9 +965,9 @@  discard block
 block discarded – undo
966 965
 				if ( ! empty( $has_multisort ) ) {
967 966
 					$atts = $this->settings->as_atts();
968 967
 
969
-					if ( $this->settings->get( 'sort_columns' ) && ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ) ) {
970
-						$sort_field_ids = array_keys( $_GET['sort'] );
971
-						$sort_directions = array_values( $_GET['sort'] );
968
+					if ( $this->settings->get( 'sort_columns' ) && ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ) ) {
969
+						$sort_field_ids = array_keys( $_GET[ 'sort' ] );
970
+						$sort_directions = array_values( $_GET[ 'sort' ] );
972 971
 					} else {
973 972
 						$sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
974 973
 						$sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
@@ -976,7 +975,7 @@  discard block
 block discarded – undo
976 975
 
977 976
 					$skip_first = false;
978 977
 
979
-					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
978
+					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
980 979
 						if ( ! $skip_first ) {
981 980
 							$skip_first = true; // Skip the first one, it's already in the query
982 981
 							continue;
@@ -996,8 +995,8 @@  discard block
 block discarded – undo
996 995
 					}
997 996
 				}
998 997
 
999
-				$query->limit( $parameters['paging']['page_size'] )
1000
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
998
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
999
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
1001 1000
 
1002 1001
 				/**
1003 1002
 				 * Any joins?
@@ -1020,7 +1019,7 @@  discard block
 block discarded – undo
1020 1019
 
1021 1020
 							$query_parameters = $query->_introspect();
1022 1021
 
1023
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
1022
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
1024 1023
 						}
1025 1024
 
1026 1025
 						/**
@@ -1054,7 +1053,7 @@  discard block
 block discarded – undo
1054 1053
 						}
1055 1054
 
1056 1055
 						$q = $query->_introspect();
1057
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
1056
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
1058 1057
 
1059 1058
 						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
1060 1059
 
@@ -1079,7 +1078,7 @@  discard block
 block discarded – undo
1079 1078
 
1080 1079
 							$query_parameters = $query->_introspect();
1081 1080
 
1082
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
1081
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
1083 1082
 						}
1084 1083
 					}
1085 1084
 				
@@ -1103,7 +1102,7 @@  discard block
 block discarded – undo
1103 1102
 							$conditions = array();
1104 1103
 
1105 1104
 							foreach ( $condition->expressions as $_condition ) {
1106
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
1105
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
1107 1106
 							}
1108 1107
 
1109 1108
 							return call_user_func_array(
@@ -1132,10 +1131,10 @@  discard block
 block discarded – undo
1132 1131
 						$q = new $query_class( $form_id );
1133 1132
 
1134 1133
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
1135
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
1134
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
1136 1135
 
1137 1136
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
1138
-						foreach ( $query_parameters['order'] as $order ) {
1137
+						foreach ( $query_parameters[ 'order' ] as $order ) {
1139 1138
 							list( $column, $_order ) = $order;
1140 1139
 
1141 1140
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1149,15 +1148,15 @@  discard block
 block discarded – undo
1149 1148
 
1150 1149
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
1151 1150
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
1152
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
1151
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
1153 1152
 
1154 1153
 							// Record the SQL
1155
-							$unions_sql[] = array(
1154
+							$unions_sql[ ] = array(
1156 1155
 								// Remove columns, we'll rebuild them
1157 1156
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
1158
-								'from'    => $sql['from'],
1159
-								'join'    => $sql['join'],
1160
-								'where'   => $sql['where'],
1157
+								'from'    => $sql[ 'from' ],
1158
+								'join'    => $sql[ 'join' ],
1159
+								'where'   => $sql[ 'where' ],
1161 1160
 								// Remove order and limit
1162 1161
 							);
1163 1162
 
@@ -1174,11 +1173,11 @@  discard block
 block discarded – undo
1174 1173
 
1175 1174
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
1176 1175
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
1177
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
1176
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
1178 1177
 
1179 1178
 						// Remove columns, we'll rebuild them
1180
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
1181
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
1179
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
1180
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
1182 1181
 
1183 1182
 						$unions = array();
1184 1183
 
@@ -1189,30 +1188,30 @@  discard block
 block discarded – undo
1189 1188
 						};
1190 1189
 
1191 1190
 						// Add all the order columns into the selects, so we can order by the whole union group
1192
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
1191
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
1193 1192
 						
1194 1193
 						$columns = array(
1195
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
1194
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
1196 1195
 						);
1197 1196
 
1198 1197
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
1199
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
1198
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
1200 1199
 
1201 1200
 							// Rewrite the order columns to the shared aliases
1202
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
1201
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
1203 1202
 						}
1204 1203
 
1205 1204
 						$columns = array_unique( $columns );
1206 1205
 
1207 1206
 						// Add the columns to every UNION
1208 1207
 						foreach ( $unions_sql as $union_sql ) {
1209
-							$union_sql['select'] .= implode( ', ', $columns );
1210
-							$unions []= implode( ' ', $union_sql );
1208
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
1209
+							$unions [ ] = implode( ' ', $union_sql );
1211 1210
 						}
1212 1211
 
1213 1212
 						// Add the columns to the main SELECT, but only grab the entry id column
1214
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
1215
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
1213
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
1214
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
1216 1215
 
1217 1216
 						return $sql;
1218 1217
 					} );
@@ -1253,20 +1252,20 @@  discard block
 block discarded – undo
1253 1252
 				} );
1254 1253
 			} else {
1255 1254
 				$entries = $this->form->entries
1256
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
1255
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
1257 1256
 					->offset( $this->settings->get( 'offset' ) )
1258
-					->limit( $parameters['paging']['page_size'] )
1257
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
1259 1258
 					->page( $page );
1260 1259
 
1261
-				if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
1260
+				if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
1262 1261
 					// Pluck off multisort arrays
1263
-					$parameters['sorting'] = $parameters['sorting'][0];
1262
+					$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
1264 1263
 				}
1265 1264
 
1266
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
1265
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
1267 1266
 					$field = new \GV\Field();
1268
-					$field->ID = $parameters['sorting']['key'];
1269
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
1267
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
1268
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
1270 1269
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
1271 1270
 				}
1272 1271
 			}
@@ -1337,7 +1336,7 @@  discard block
 block discarded – undo
1337 1336
 		$allowed = $headers = array();
1338 1337
 
1339 1338
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) {
1340
-			$allowed[] = $field;
1339
+			$allowed[ ] = $field;
1341 1340
 		}
1342 1341
 
1343 1342
 		$renderer = new Field_Renderer();
@@ -1359,17 +1358,17 @@  discard block
 block discarded – undo
1359 1358
 			} );
1360 1359
 
1361 1360
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
1362
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1361
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1363 1362
 			}
1364 1363
 
1365 1364
 			foreach ( $allowed as $field ) {
1366 1365
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
1367 1366
 
1368
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
1367
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
1369 1368
 
1370 1369
 				if ( ! $headers_done ) {
1371 1370
 					$label = $field->get_label( $view, $source, $entry );
1372
-					$headers[] = $label ? $label : $field->ID;
1371
+					$headers[ ] = $label ? $label : $field->ID;
1373 1372
 				}
1374 1373
 			}
1375 1374
 
Please login to merge, or discard this patch.