|  | @@ -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 |   | 
                                                                                                                                                        
                                                        |  | @@ -915,11 +915,11 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 915 | 915 |  			 * Remove multiple sorting before calling legacy filters. | 
                                                                                                            
                                                            | 916 | 916 |  			 * This allows us to fake it till we make it. | 
                                                                                                            
                                                            | 917 | 917 |  			 */ | 
                                                                                                            
                                                            | 918 |  | -			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { | 
                                                                                                            
                                                            |  | 918 | +			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { | 
                                                                                                            
                                                            | 919 | 919 |  				$has_multisort = true; | 
                                                                                                            
                                                            | 920 |  | -				$parameters['sort_field'] = reset( $parameters['sort_field'] ); | 
                                                                                                            
                                                            | 921 |  | -				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { | 
                                                                                                            
                                                            | 922 |  | -					$parameters['sort_direction'] = reset( $parameters['sort_direction'] ); | 
                                                                                                            
                                                            |  | 920 | +				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); | 
                                                                                                            
                                                            |  | 921 | +				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { | 
                                                                                                            
                                                            |  | 922 | +					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); | 
                                                                                                            
                                                            | 923 | 923 |  				} | 
                                                                                                            
                                                            | 924 | 924 |  			} | 
                                                                                                            
                                                            | 925 | 925 |   | 
                                                                                                                                                        
                                                        |  | @@ -927,34 +927,33 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 927 | 927 |  			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead | 
                                                                                                            
                                                            | 928 | 928 |  			 */ | 
                                                                                                            
                                                            | 929 | 929 |  			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); | 
                                                                                                            
                                                            | 930 |  | -			$parameters['context_view_id'] = $this->ID; | 
                                                                                                            
                                                            |  | 930 | +			$parameters[ 'context_view_id' ] = $this->ID; | 
                                                                                                            
                                                            | 931 | 931 |  			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); | 
                                                                                                            
                                                            | 932 | 932 |   | 
                                                                                                            
                                                            | 933 | 933 |  			if ( $request instanceof REST\Request ) { | 
                                                                                                            
                                                            | 934 | 934 |  				$atts = $this->settings->as_atts(); | 
                                                                                                            
                                                            | 935 | 935 |  				$paging_parameters = wp_parse_args( $request->get_paging(), array( | 
                                                                                                            
                                                            | 936 |  | -						'paging' => array( 'page_size' => $atts['page_size'] ), | 
                                                                                                            
                                                            |  | 936 | +						'paging' => array( 'page_size' => $atts[ 'page_size' ] ), | 
                                                                                                            
                                                            | 937 | 937 |  					) ); | 
                                                                                                            
                                                            | 938 |  | -				$parameters['paging'] = $paging_parameters['paging']; | 
                                                                                                            
                                                            |  | 938 | +				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; | 
                                                                                                            
                                                            | 939 | 939 |  			} | 
                                                                                                            
                                                            | 940 | 940 |   | 
                                                                                                            
                                                            | 941 |  | -			$page = Utils::get( $parameters['paging'], 'current_page' ) ? | 
                                                                                                            
                                                            | 942 |  | -				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); | 
                                                                                                            
                                                            |  | 941 | +			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); | 
                                                                                                            
                                                            | 943 | 942 |   | 
                                                                                                            
                                                            | 944 | 943 |  			/** | 
                                                                                                            
                                                            | 945 | 944 |  			 * Cleanup duplicate field_filter parameters to simplify the query. | 
                                                                                                            
                                                            | 946 | 945 |  			 */ | 
                                                                                                            
                                                            | 947 | 946 |  			$unique_field_filters = array(); | 
                                                                                                            
                                                            | 948 |  | -			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) { | 
                                                                                                            
                                                            |  | 947 | +			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) { | 
                                                                                                            
                                                            | 949 | 948 |  				if ( 'mode' === $key ) { | 
                                                                                                            
                                                            | 950 |  | -					$unique_field_filters['mode'] = $filter; | 
                                                                                                            
                                                            |  | 949 | +					$unique_field_filters[ 'mode' ] = $filter; | 
                                                                                                            
                                                            | 951 | 950 |  				} else if ( ! in_array( $filter, $unique_field_filters ) ) { | 
                                                                                                            
                                                            | 952 |  | -					$unique_field_filters[] = $filter; | 
                                                                                                            
                                                            |  | 951 | +					$unique_field_filters[ ] = $filter; | 
                                                                                                            
                                                            | 953 | 952 |  				} | 
                                                                                                            
                                                            | 954 | 953 |  			} | 
                                                                                                            
                                                            | 955 |  | -			$parameters['search_criteria']['field_filters'] = $unique_field_filters; | 
                                                                                                            
                                                            |  | 954 | +			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; | 
                                                                                                            
                                                            | 956 | 955 |   | 
                                                                                                            
                                                            | 957 |  | -			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { | 
                                                                                                            
                                                            |  | 956 | +			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { | 
                                                                                                            
                                                            | 958 | 957 |  				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); | 
                                                                                                            
                                                            | 959 | 958 |  			} | 
                                                                                                            
                                                            | 960 | 959 |   | 
                                                                                                                                                        
                                                        |  | @@ -963,7 +962,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 963 | 962 |  				$query_class = $this->get_query_class(); | 
                                                                                                            
                                                            | 964 | 963 |   | 
                                                                                                            
                                                            | 965 | 964 |  				/** @var \GF_Query $query */ | 
                                                                                                            
                                                            | 966 |  | -				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); | 
                                                                                                            
                                                            |  | 965 | +				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); | 
                                                                                                            
                                                            | 967 | 966 |   | 
                                                                                                            
                                                            | 968 | 967 |  				/** | 
                                                                                                            
                                                            | 969 | 968 |  				 * Apply multisort. | 
                                                                                                                                                        
                                                        |  | @@ -974,15 +973,15 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 974 | 973 |  					$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); | 
                                                                                                            
                                                            | 975 | 974 |  					$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); | 
                                                                                                            
                                                            | 976 | 975 |   | 
                                                                                                            
                                                            | 977 |  | -					$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); | 
                                                                                                            
                                                            |  | 976 | +					$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); | 
                                                                                                            
                                                            | 978 | 977 |   | 
                                                                                                            
                                                            | 979 |  | -					if( $has_sort_query_param ) { | 
                                                                                                            
                                                            | 980 |  | -						$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); | 
                                                                                                            
                                                            |  | 978 | +					if ( $has_sort_query_param ) { | 
                                                                                                            
                                                            |  | 979 | +						$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); | 
                                                                                                            
                                                            | 981 | 980 |  					} | 
                                                                                                            
                                                            | 982 | 981 |   | 
                                                                                                            
                                                            | 983 | 982 |  					if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { | 
                                                                                                            
                                                            | 984 |  | -						$sort_field_ids = array_keys( $_GET['sort'] ); | 
                                                                                                            
                                                            | 985 |  | -						$sort_directions = array_values( $_GET['sort'] ); | 
                                                                                                            
                                                            |  | 983 | +						$sort_field_ids = array_keys( $_GET[ 'sort' ] ); | 
                                                                                                            
                                                            |  | 984 | +						$sort_directions = array_values( $_GET[ 'sort' ] ); | 
                                                                                                            
                                                            | 986 | 985 |  					} else { | 
                                                                                                            
                                                            | 987 | 986 |  						$sort_field_ids = $view_setting_sort_field_ids; | 
                                                                                                            
                                                            | 988 | 987 |  						$sort_directions = $view_setting_sort_directions; | 
                                                                                                                                                        
                                                        |  | @@ -990,7 +989,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 990 | 989 |   | 
                                                                                                            
                                                            | 991 | 990 |  					$skip_first = false; | 
                                                                                                            
                                                            | 992 | 991 |   | 
                                                                                                            
                                                            | 993 |  | -					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { | 
                                                                                                            
                                                            |  | 992 | +					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { | 
                                                                                                            
                                                            | 994 | 993 |   | 
                                                                                                            
                                                            | 995 | 994 |  						if ( ! $skip_first && ! $has_sort_query_param ) { | 
                                                                                                            
                                                            | 996 | 995 |  							$skip_first = true; // Skip the first one, it's already in the query | 
                                                                                                                                                        
                                                        |  | @@ -1020,15 +1019,15 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1020 | 1019 |   | 
                                                                                                            
                                                            | 1021 | 1020 |  					$merged_time = false; | 
                                                                                                            
                                                            | 1022 | 1021 |   | 
                                                                                                            
                                                            | 1023 |  | -					foreach ( $q['order'] as $oid => $order ) { | 
                                                                                                            
                                                            | 1024 |  | -						if ( $order[0] instanceof \GF_Query_Column ) { | 
                                                                                                            
                                                            | 1025 |  | -							$column = $order[0]; | 
                                                                                                            
                                                            | 1026 |  | -						} else if ( $order[0] instanceof \GF_Query_Call ) { | 
                                                                                                            
                                                            | 1027 |  | -							if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { | 
                                                                                                            
                                                            |  | 1022 | +					foreach ( $q[ 'order' ] as $oid => $order ) { | 
                                                                                                            
                                                            |  | 1023 | +						if ( $order[ 0 ] instanceof \GF_Query_Column ) { | 
                                                                                                            
                                                            |  | 1024 | +							$column = $order[ 0 ]; | 
                                                                                                            
                                                            |  | 1025 | +						} else if ( $order[ 0 ] instanceof \GF_Query_Call ) { | 
                                                                                                            
                                                            |  | 1026 | +							if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { | 
                                                                                                            
                                                            | 1028 | 1027 |  								$orders[ $oid ] = $order; | 
                                                                                                            
                                                            | 1029 | 1028 |  								continue; // Need something that resembles a single sort | 
                                                                                                            
                                                            | 1030 | 1029 |  							} | 
                                                                                                            
                                                            | 1031 |  | -							$column = $order[0]->columns[0]; | 
                                                                                                            
                                                            |  | 1030 | +							$column = $order[ 0 ]->columns[ 0 ]; | 
                                                                                                            
                                                            | 1032 | 1031 |  						} | 
                                                                                                            
                                                            | 1033 | 1032 |   | 
                                                                                                            
                                                            | 1034 | 1033 |  						if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { | 
                                                                                                                                                        
                                                        |  | @@ -1042,7 +1041,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1042 | 1041 |   | 
                                                                                                            
                                                            | 1043 | 1042 |  						$orders[ $oid ] = array( | 
                                                                                                            
                                                            | 1044 | 1043 |  							new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), | 
                                                                                                            
                                                            | 1045 |  | -							$order[1] // Mock it! | 
                                                                                                            
                                                            |  | 1044 | +							$order[ 1 ] // Mock it! | 
                                                                                                            
                                                            | 1046 | 1045 |  						); | 
                                                                                                            
                                                            | 1047 | 1046 |   | 
                                                                                                            
                                                            | 1048 | 1047 |  						$merged_time = true; | 
                                                                                                                                                        
                                                        |  | @@ -1053,7 +1052,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1053 | 1052 |  						 * ORDER again. | 
                                                                                                            
                                                            | 1054 | 1053 |  						 */ | 
                                                                                                            
                                                            | 1055 | 1054 |  						if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { | 
                                                                                                            
                                                            | 1056 |  | -							$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); | 
                                                                                                            
                                                            |  | 1055 | +							$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); | 
                                                                                                            
                                                            | 1057 | 1056 |  						} | 
                                                                                                            
                                                            | 1058 | 1057 |  					} | 
                                                                                                            
                                                            | 1059 | 1058 |   | 
                                                                                                                                                        
                                                        |  | @@ -1063,8 +1062,8 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1063 | 1062 |  				$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); | 
                                                                                                            
                                                            | 1064 | 1063 |  				$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); | 
                                                                                                            
                                                            | 1065 | 1064 |   | 
                                                                                                            
                                                            | 1066 |  | -				$query->limit( $parameters['paging']['page_size'] ) | 
                                                                                                            
                                                            | 1067 |  | -					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); | 
                                                                                                            
                                                            |  | 1065 | +				$query->limit( $parameters[ 'paging' ][ 'page_size' ] ) | 
                                                                                                            
                                                            |  | 1066 | +					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); | 
                                                                                                            
                                                            | 1068 | 1067 |   | 
                                                                                                            
                                                            | 1069 | 1068 |  				/** | 
                                                                                                            
                                                            | 1070 | 1069 |  				 * Any joins? | 
                                                                                                                                                        
                                                        |  | @@ -1087,7 +1086,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1087 | 1086 |   | 
                                                                                                            
                                                            | 1088 | 1087 |  							$query_parameters = $query->_introspect(); | 
                                                                                                            
                                                            | 1089 | 1088 |   | 
                                                                                                            
                                                            | 1090 |  | -							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); | 
                                                                                                            
                                                            |  | 1089 | +							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); | 
                                                                                                            
                                                            | 1091 | 1090 |  						} | 
                                                                                                            
                                                            | 1092 | 1091 |   | 
                                                                                                            
                                                            | 1093 | 1092 |  						/** | 
                                                                                                                                                        
                                                        |  | @@ -1121,7 +1120,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1121 | 1120 |  						} | 
                                                                                                            
                                                            | 1122 | 1121 |   | 
                                                                                                            
                                                            | 1123 | 1122 |  						$q = $query->_introspect(); | 
                                                                                                            
                                                            | 1124 |  | -						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); | 
                                                                                                            
                                                            |  | 1123 | +						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); | 
                                                                                                            
                                                            | 1125 | 1124 |   | 
                                                                                                            
                                                            | 1126 | 1125 |  						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { | 
                                                                                                            
                                                            | 1127 | 1126 |   | 
                                                                                                                                                        
                                                        |  | @@ -1146,7 +1145,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1146 | 1145 |   | 
                                                                                                            
                                                            | 1147 | 1146 |  							$query_parameters = $query->_introspect(); | 
                                                                                                            
                                                            | 1148 | 1147 |   | 
                                                                                                            
                                                            | 1149 |  | -							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); | 
                                                                                                            
                                                            |  | 1148 | +							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); | 
                                                                                                            
                                                            | 1150 | 1149 |  						} | 
                                                                                                            
                                                            | 1151 | 1150 |  					} | 
                                                                                                            
                                                            | 1152 | 1151 |  				 | 
                                                                                                                                                        
                                                        |  | @@ -1170,7 +1169,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1170 | 1169 |  							$conditions = array(); | 
                                                                                                            
                                                            | 1171 | 1170 |   | 
                                                                                                            
                                                            | 1172 | 1171 |  							foreach ( $condition->expressions as $_condition ) { | 
                                                                                                            
                                                            | 1173 |  | -								$conditions[] = $recurse( $_condition, $fields, $recurse ); | 
                                                                                                            
                                                            |  | 1172 | +								$conditions[ ] = $recurse( $_condition, $fields, $recurse ); | 
                                                                                                            
                                                            | 1174 | 1173 |  							} | 
                                                                                                            
                                                            | 1175 | 1174 |   | 
                                                                                                            
                                                            | 1176 | 1175 |  							return call_user_func_array( | 
                                                                                                                                                        
                                                        |  | @@ -1199,10 +1198,10 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1199 | 1198 |  						$q = new $query_class( $form_id ); | 
                                                                                                            
                                                            | 1200 | 1199 |   | 
                                                                                                            
                                                            | 1201 | 1200 |  						// Copy the WHERE clauses but substitute the field_ids to the respective ones | 
                                                                                                            
                                                            | 1202 |  | -						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); | 
                                                                                                            
                                                            |  | 1201 | +						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); | 
                                                                                                            
                                                            | 1203 | 1202 |   | 
                                                                                                            
                                                            | 1204 | 1203 |  						// Copy the ORDER clause and substitute the field_ids to the respective ones | 
                                                                                                            
                                                            | 1205 |  | -						foreach ( $query_parameters['order'] as $order ) { | 
                                                                                                            
                                                            |  | 1204 | +						foreach ( $query_parameters[ 'order' ] as $order ) { | 
                                                                                                            
                                                            | 1206 | 1205 |  							list( $column, $_order ) = $order; | 
                                                                                                            
                                                            | 1207 | 1206 |   | 
                                                                                                            
                                                            | 1208 | 1207 |  							if ( $column && $column instanceof \GF_Query_Column ) { | 
                                                                                                                                                        
                                                        |  | @@ -1216,15 +1215,15 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1216 | 1215 |   | 
                                                                                                            
                                                            | 1217 | 1216 |  						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { | 
                                                                                                            
                                                            | 1218 | 1217 |  							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses | 
                                                                                                            
                                                            | 1219 |  | -							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); | 
                                                                                                            
                                                            |  | 1218 | +							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); | 
                                                                                                            
                                                            | 1220 | 1219 |   | 
                                                                                                            
                                                            | 1221 | 1220 |  							// Record the SQL | 
                                                                                                            
                                                            | 1222 |  | -							$unions_sql[] = array( | 
                                                                                                            
                                                            |  | 1221 | +							$unions_sql[ ] = array( | 
                                                                                                            
                                                            | 1223 | 1222 |  								// Remove columns, we'll rebuild them | 
                                                                                                            
                                                            | 1224 | 1223 |  								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), | 
                                                                                                            
                                                            | 1225 |  | -								'from'    => $sql['from'], | 
                                                                                                            
                                                            | 1226 |  | -								'join'    => $sql['join'], | 
                                                                                                            
                                                            | 1227 |  | -								'where'   => $sql['where'], | 
                                                                                                            
                                                            |  | 1224 | +								'from'    => $sql[ 'from' ], | 
                                                                                                            
                                                            |  | 1225 | +								'join'    => $sql[ 'join' ], | 
                                                                                                            
                                                            |  | 1226 | +								'where'   => $sql[ 'where' ], | 
                                                                                                            
                                                            | 1228 | 1227 |  								// Remove order and limit | 
                                                                                                            
                                                            | 1229 | 1228 |  							); | 
                                                                                                            
                                                            | 1230 | 1229 |   | 
                                                                                                                                                        
                                                        |  | @@ -1241,11 +1240,11 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1241 | 1240 |   | 
                                                                                                            
                                                            | 1242 | 1241 |  					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { | 
                                                                                                            
                                                            | 1243 | 1242 |  						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses | 
                                                                                                            
                                                            | 1244 |  | -						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); | 
                                                                                                            
                                                            |  | 1243 | +						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); | 
                                                                                                            
                                                            | 1245 | 1244 |   | 
                                                                                                            
                                                            | 1246 | 1245 |  						// Remove columns, we'll rebuild them | 
                                                                                                            
                                                            | 1247 |  | -						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); | 
                                                                                                            
                                                            | 1248 |  | -						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); | 
                                                                                                            
                                                            |  | 1246 | +						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); | 
                                                                                                            
                                                            |  | 1247 | +						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); | 
                                                                                                            
                                                            | 1249 | 1248 |   | 
                                                                                                            
                                                            | 1250 | 1249 |  						$unions = array(); | 
                                                                                                            
                                                            | 1251 | 1250 |   | 
                                                                                                                                                        
                                                        |  | @@ -1256,30 +1255,30 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1256 | 1255 |  						}; | 
                                                                                                            
                                                            | 1257 | 1256 |   | 
                                                                                                            
                                                            | 1258 | 1257 |  						// Add all the order columns into the selects, so we can order by the whole union group | 
                                                                                                            
                                                            | 1259 |  | -						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); | 
                                                                                                            
                                                            |  | 1258 | +						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); | 
                                                                                                            
                                                            | 1260 | 1259 |  						 | 
                                                                                                            
                                                            | 1261 | 1260 |  						$columns = array( | 
                                                                                                            
                                                            | 1262 |  | -							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) | 
                                                                                                            
                                                            |  | 1261 | +							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) | 
                                                                                                            
                                                            | 1263 | 1262 |  						); | 
                                                                                                            
                                                            | 1264 | 1263 |   | 
                                                                                                            
                                                            | 1265 | 1264 |  						foreach ( array_slice( $order_matches, 1 ) as $match ) { | 
                                                                                                            
                                                            | 1266 |  | -							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); | 
                                                                                                            
                                                            |  | 1265 | +							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); | 
                                                                                                            
                                                            | 1267 | 1266 |   | 
                                                                                                            
                                                            | 1268 | 1267 |  							// Rewrite the order columns to the shared aliases | 
                                                                                                            
                                                            | 1269 |  | -							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); | 
                                                                                                            
                                                            |  | 1268 | +							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); | 
                                                                                                            
                                                            | 1270 | 1269 |  						} | 
                                                                                                            
                                                            | 1271 | 1270 |   | 
                                                                                                            
                                                            | 1272 | 1271 |  						$columns = array_unique( $columns ); | 
                                                                                                            
                                                            | 1273 | 1272 |   | 
                                                                                                            
                                                            | 1274 | 1273 |  						// Add the columns to every UNION | 
                                                                                                            
                                                            | 1275 | 1274 |  						foreach ( $unions_sql as $union_sql ) { | 
                                                                                                            
                                                            | 1276 |  | -							$union_sql['select'] .= implode( ', ', $columns ); | 
                                                                                                            
                                                            | 1277 |  | -							$unions []= implode( ' ', $union_sql ); | 
                                                                                                            
                                                            |  | 1275 | +							$union_sql[ 'select' ] .= implode( ', ', $columns ); | 
                                                                                                            
                                                            |  | 1276 | +							$unions [ ] = implode( ' ', $union_sql ); | 
                                                                                                            
                                                            | 1278 | 1277 |  						} | 
                                                                                                            
                                                            | 1279 | 1278 |   | 
                                                                                                            
                                                            | 1280 | 1279 |  						// Add the columns to the main SELECT, but only grab the entry id column | 
                                                                                                            
                                                            | 1281 |  | -						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); | 
                                                                                                            
                                                            | 1282 |  | -						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; | 
                                                                                                            
                                                            |  | 1280 | +						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); | 
                                                                                                            
                                                            |  | 1281 | +						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; | 
                                                                                                            
                                                            | 1283 | 1282 |   | 
                                                                                                            
                                                            | 1284 | 1283 |  						return $sql; | 
                                                                                                            
                                                            | 1285 | 1284 |  					} ); | 
                                                                                                                                                        
                                                        |  | @@ -1320,20 +1319,20 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1320 | 1319 |  				} ); | 
                                                                                                            
                                                            | 1321 | 1320 |  			} else { | 
                                                                                                            
                                                            | 1322 | 1321 |  				$entries = $this->form->entries | 
                                                                                                            
                                                            | 1323 |  | -					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) | 
                                                                                                            
                                                            |  | 1322 | +					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) | 
                                                                                                            
                                                            | 1324 | 1323 |  					->offset( $this->settings->get( 'offset' ) ) | 
                                                                                                            
                                                            | 1325 |  | -					->limit( $parameters['paging']['page_size'] ) | 
                                                                                                            
                                                            |  | 1324 | +					->limit( $parameters[ 'paging' ][ 'page_size' ] ) | 
                                                                                                            
                                                            | 1326 | 1325 |  					->page( $page ); | 
                                                                                                            
                                                            | 1327 | 1326 |   | 
                                                                                                            
                                                            | 1328 |  | -				if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { | 
                                                                                                            
                                                            |  | 1327 | +				if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { | 
                                                                                                            
                                                            | 1329 | 1328 |  					// Pluck off multisort arrays | 
                                                                                                            
                                                            | 1330 |  | -					$parameters['sorting'] = $parameters['sorting'][0]; | 
                                                                                                            
                                                            |  | 1329 | +					$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; | 
                                                                                                            
                                                            | 1331 | 1330 |  				} | 
                                                                                                            
                                                            | 1332 | 1331 |   | 
                                                                                                            
                                                            | 1333 |  | -				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { | 
                                                                                                            
                                                            |  | 1332 | +				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { | 
                                                                                                            
                                                            | 1334 | 1333 |  					$field = new \GV\Field(); | 
                                                                                                            
                                                            | 1335 |  | -					$field->ID = $parameters['sorting']['key']; | 
                                                                                                            
                                                            | 1336 |  | -					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; | 
                                                                                                            
                                                            |  | 1334 | +					$field->ID = $parameters[ 'sorting' ][ 'key' ]; | 
                                                                                                            
                                                            |  | 1335 | +					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; | 
                                                                                                            
                                                            | 1337 | 1336 |  					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); | 
                                                                                                            
                                                            | 1338 | 1337 |  				} | 
                                                                                                            
                                                            | 1339 | 1338 |  			} | 
                                                                                                                                                        
                                                        |  | @@ -1408,7 +1407,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1408 | 1407 |  		$allowed = $headers = array(); | 
                                                                                                            
                                                            | 1409 | 1408 |   | 
                                                                                                            
                                                            | 1410 | 1409 |  		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) { | 
                                                                                                            
                                                            | 1411 |  | -			$allowed[] = $field; | 
                                                                                                            
                                                            |  | 1410 | +			$allowed[ ] = $field; | 
                                                                                                            
                                                            | 1412 | 1411 |  		} | 
                                                                                                            
                                                            | 1413 | 1412 |   | 
                                                                                                            
                                                            | 1414 | 1413 |  		$renderer = new Field_Renderer(); | 
                                                                                                                                                        
                                                        |  | @@ -1430,17 +1429,17 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 1430 | 1429 |  			} ); | 
                                                                                                            
                                                            | 1431 | 1430 |   | 
                                                                                                            
                                                            | 1432 | 1431 |  			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { | 
                                                                                                            
                                                            | 1433 |  | -				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); | 
                                                                                                            
                                                            |  | 1432 | +				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); | 
                                                                                                            
                                                            | 1434 | 1433 |  			} | 
                                                                                                            
                                                            | 1435 | 1434 |   | 
                                                                                                            
                                                            | 1436 | 1435 |  			foreach ( $allowed as $field ) { | 
                                                                                                            
                                                            | 1437 | 1436 |  				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); | 
                                                                                                            
                                                            | 1438 | 1437 |   | 
                                                                                                            
                                                            | 1439 |  | -				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); | 
                                                                                                            
                                                            |  | 1438 | +				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); | 
                                                                                                            
                                                            | 1440 | 1439 |   | 
                                                                                                            
                                                            | 1441 | 1440 |  				if ( ! $headers_done ) { | 
                                                                                                            
                                                            | 1442 | 1441 |  					$label = $field->get_label( $view, $source, $entry ); | 
                                                                                                            
                                                            | 1443 |  | -					$headers[] = $label ? $label : $field->ID; | 
                                                                                                            
                                                            |  | 1442 | +					$headers[ ] = $label ? $label : $field->ID; | 
                                                                                                            
                                                            | 1444 | 1443 |  				} | 
                                                                                                            
                                                            | 1445 | 1444 |  			} | 
                                                                                                            
                                                            | 1446 | 1445 |   |