Completed
Push — develop ( b948c4...a1d7eb )
by Zack
19:39
created
includes/fields/class-gravityview-field-date.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,6 @@
 block discarded – undo
40 40
 	 * Get the default date format for a field based on the field ID and the time format setting
41 41
 	 *
42 42
 	 * @since 1.16.4
43
-
44 43
 	 * @param string $date_format The Gravity Forms date format for the field. Default: "mdy"
45 44
 	 * @param int $field_id The ID of the field. Used to figure out full date/day/month/year
46 45
 	 *
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
 
32 32
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
33 33
 
34
-		if( 'edit' === $context ) {
34
+		if ( 'edit' === $context ) {
35 35
 			return $field_options;
36 36
 		}
37 37
 
38
-		$this->add_field_support('date_display', $field_options );
38
+		$this->add_field_support( 'date_display', $field_options );
39 39
 
40 40
 		return $field_options;
41 41
 	}
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		$field_input_id = gravityview_get_input_id_from_id( $field_id );
84 84
 
85 85
 		$date_field_output = '';
86
-		switch( $field_input_id ) {
86
+		switch ( $field_input_id ) {
87 87
 			case 1:
88 88
 				$date_field_output = \GV\Utils::get( $parsed_date, 'month' );
89 89
 				break;
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-coupon.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		 */
54 54
 		$hide_coupon_fields = apply_filters( 'gravityview/edit_entry/hide-coupon-fields', $has_transaction_data );
55 55
 
56
-		return (bool) $hide_coupon_fields;
56
+		return (bool)$hide_coupon_fields;
57 57
 	}
58 58
 
59 59
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	public function edit_entry_field_blacklist( $blacklist = array(), $entry = array() ) {
70 70
 
71 71
 		if ( $this->should_hide_coupon_fields( $entry ) ) {
72
-			$blacklist[] = 'coupon';
72
+			$blacklist[ ] = 'coupon';
73 73
 		}
74 74
 
75 75
 		return $blacklist;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 		// No coupons match the codes provided
108 108
 		$discounts = gf_coupons()->get_coupons_by_codes( $coupon_codes, $form );
109 109
 
110
-		if( ! $discounts ) {
110
+		if ( ! $discounts ) {
111 111
 			return $value;
112 112
 		}
113 113
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		 * @see GF_Field_Coupon::get_field_input
117 117
 		 */
118 118
 		$_POST = ! isset( $_POST ) ? array() : $_POST;
119
-		$_POST[ 'gf_coupons_' . $form['id'] ] = json_encode( (array) $discounts );
119
+		$_POST[ 'gf_coupons_' . $form[ 'id' ] ] = json_encode( (array)$discounts );
120 120
 		$_POST[ 'input_' . $field->id ] = implode( ',', $coupon_codes );
121 121
 
122 122
 		return $value;
Please login to merge, or discard this patch.
includes/admin/field-types/type_multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		?>
14 14
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
15 15
 
16
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
16
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
17 17
 
18 18
 			echo $this->get_tooltip() . $this->get_field_desc();
19 19
 
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 
27 27
 	function render_input( $override_input = null ) {
28 28
 
29
-		if( isset( $override_input ) ) {
29
+		if ( isset( $override_input ) ) {
30 30
 			echo $override_input;
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		?>
35 35
 		<select name="<?php echo esc_attr( $this->name ); ?>[]" id="<?php echo $this->get_field_id(); ?>" multiple="multiple">
36
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
36
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
37 37
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( in_array( $value, (array)$this->value ), true, true ); ?>><?php echo esc_html( $label ); ?></option>
38 38
 			<?php endforeach; ?>
39 39
 		</select>
Please login to merge, or discard this patch.
includes/class-common.php 4 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 				}
325 325
 
326 326
 
327
-				if( GFCommon::is_product_field( $field['type'] ) ){
327
+				if( GFCommon::is_product_field( $field['type'] ) ) {
328 328
 					$has_product_fields = true;
329 329
 				}
330 330
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 
385 385
 		$fields = array();
386 386
 
387
-		foreach ( $extra_fields as $key => $field ){
387
+		foreach ( $extra_fields as $key => $field ) {
388 388
 			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
389 389
 				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
390 390
 			}
@@ -978,7 +978,7 @@  discard block
 block discarded – undo
978 978
 			$form = GFAPI::get_form( $form );
979 979
 		}
980 980
 
981
-		if ( class_exists( 'GFFormsModel' ) ){
981
+		if ( class_exists( 'GFFormsModel' ) ) {
982 982
 			return GFFormsModel::get_field( $form, $field_id );
983 983
 		} else {
984 984
 			return null;
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 			$shortcodes = array();
1026 1026
 
1027 1027
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1028
-			if ( empty( $matches ) ){
1028
+			if ( empty( $matches ) ) {
1029 1029
 				return false;
1030 1030
 			}
1031 1031
 
Please login to merge, or discard this patch.
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -310,12 +310,12 @@  discard block
 block discarded – undo
310 310
 						}
311 311
 
312 312
 						/**
313
-                         * @hack
314
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
315
-                         */
313
+						 * @hack
314
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
315
+						 */
316 316
 						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
317
-                            continue;
318
-                        }
317
+							continue;
318
+						}
319 319
 						$fields["{$input['id']}"] = array(
320 320
 							'label' => \GV\Utils::get( $input, 'label' ),
321 321
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
@@ -1488,7 +1488,7 @@  discard block
 block discarded – undo
1488 1488
 			),
1489 1489
 		);
1490 1490
 
1491
-        $fields = $date_created + $fields;
1491
+		$fields = $date_created + $fields;
1492 1492
 
1493 1493
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1494 1494
 
@@ -1516,13 +1516,13 @@  discard block
 block discarded – undo
1516 1516
 
1517 1517
 		}
1518 1518
 
1519
-        /**
1520
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1521
-         * @since 1.12
1522
-         * @param array $fields Sub-set of GF form fields that are sortable
1523
-         * @param int $formid The Gravity Forms form ID that the fields are from
1524
-         */
1525
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1519
+		/**
1520
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1521
+		 * @since 1.12
1522
+		 * @param array $fields Sub-set of GF form fields that are sortable
1523
+		 * @param int $formid The Gravity Forms form ID that the fields are from
1524
+		 */
1525
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1526 1526
 
1527 1527
 		return $fields;
1528 1528
 	}
@@ -1814,26 +1814,26 @@  discard block
 block discarded – undo
1814 1814
 	}
1815 1815
 
1816 1816
 
1817
-    /**
1818
-     * Display updated/error notice
1819
-     *
1820
-     * @since 1.19.2 Added $cap and $object_id parameters
1821
-     *
1822
-     * @param string $notice text/HTML of notice
1823
-     * @param string $class CSS class for notice (`updated` or `error`)
1824
-     * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
1825
-     *
1826
-     * @return string
1827
-     */
1828
-    public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1829
-
1830
-    	// If $cap is defined, only show notice if user has capability
1831
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1832
-    		return '';
1833
-	    }
1834
-
1835
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1836
-    }
1817
+	/**
1818
+	 * Display updated/error notice
1819
+	 *
1820
+	 * @since 1.19.2 Added $cap and $object_id parameters
1821
+	 *
1822
+	 * @param string $notice text/HTML of notice
1823
+	 * @param string $class CSS class for notice (`updated` or `error`)
1824
+	 * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
1825
+	 *
1826
+	 * @return string
1827
+	 */
1828
+	public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1829
+
1830
+		// If $cap is defined, only show notice if user has capability
1831
+		if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1832
+			return '';
1833
+		}
1834
+
1835
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1836
+	}
1837 1837
 
1838 1838
 	/**
1839 1839
 	 * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 	/**
282 282
 	 * Return array of fields' id and label, for a given Form ID
283 283
 	 *
284
-	 * @param string|array $form_id (default: '') or $form object
284
+	 * @param string|array $form (default: '') or $form object
285 285
 	 * @param bool $add_default_properties
286 286
 	 * @param bool $include_parent_field
287 287
 	 * @return array
@@ -1034,7 +1034,7 @@  discard block
 block discarded – undo
1034 1034
 	 *
1035 1035
 	 * @param array $form Gravity Forms form array
1036 1036
 	 * @param string $field_id ID of the field. If an input, full input ID (like `1.3`)
1037
-	 * @param string|array $field_value Raw value of the field.
1037
+	 * @param string $field_value Raw value of the field.
1038 1038
 	 * @return string
1039 1039
 	 */
1040 1040
 	public static function get_field_label( $form = array(), $field_id = '', $field_value = '' ) {
@@ -1555,7 +1555,7 @@  discard block
 block discarded – undo
1555 1555
 	 *
1556 1556
 	 * Do the same than parse_str without max_input_vars limitation:
1557 1557
 	 * Parses $string as if it were the query string passed via a URL and sets variables in the current scope.
1558
-	 * @param $string string string to parse (not altered like in the original parse_str(), use the second parameter!)
1558
+	 * @param string $string string string to parse (not altered like in the original parse_str(), use the second parameter!)
1559 1559
 	 * @param $result array  If the second parameter is present, variables are stored in this variable as array elements
1560 1560
 	 * @return bool true or false if $string is an empty string
1561 1561
 	 * @since  1.5.3
@@ -1791,9 +1791,9 @@  discard block
 block discarded – undo
1791 1791
 	 * @param string $message            Message body (required)
1792 1792
 	 * @param string $from_name          Displayed name of the sender
1793 1793
 	 * @param string $message_format     If "html", sent text as `text/html`. Otherwise, `text/plain`. Default: "html".
1794
-	 * @param string|array $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
1794
+	 * @param string $attachments  Optional. Files to attach. {@see wp_mail()} for usage. Default: "".
1795 1795
 	 * @param array|false $entry         Gravity Forms entry array, related to the email. Default: false.
1796
-	 * @param array|false $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
1796
+	 * @param boolean $notification  Gravity Forms notification that triggered the email. {@see GFCommon::send_notification}. Default:false.
1797 1797
 	 */
1798 1798
 	public static function send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name = '', $message_format = 'html', $attachments = '', $entry = false, $notification = false ) {
1799 1799
 
Please login to merge, or discard this patch.
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 
125 125
 		$form = false;
126 126
 
127
-		if( $entry ) {
128
-			$form = GFAPI::get_form( $entry['form_id'] );
127
+		if ( $entry ) {
128
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
129 129
 		}
130 130
 
131 131
 		return $form;
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			}
202 202
 		}
203 203
 
204
-		return (bool) $has_transaction_data;
204
+		return (bool)$has_transaction_data;
205 205
 	}
206 206
 
207 207
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
241 241
 
242
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
242
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
243 243
 
244 244
 		return $result;
245 245
 	}
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
 	 *
260 260
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
261 261
 	 */
262
-	public static function get_forms(  $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
262
+	public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
263 263
 		$forms = array();
264 264
 		if ( ! class_exists( 'GFAPI' ) ) {
265 265
 			return array();
266 266
 		}
267 267
 
268
-		if( 'any' === $active ) {
268
+		if ( 'any' === $active ) {
269 269
 			$active_forms = GFAPI::get_forms( true, $trash );
270 270
 			$inactive_forms = GFAPI::get_forms( false, $trash );
271 271
 			$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
 		$has_post_fields = false;
298 298
 
299 299
 		if ( $form ) {
300
-			foreach ( $form['fields'] as $field ) {
301
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
302
-					$fields["{$field['id']}"] = array(
300
+			foreach ( $form[ 'fields' ] as $field ) {
301
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
302
+					$fields[ "{$field[ 'id' ]}" ] = array(
303 303
 						'label' => \GV\Utils::get( $field, 'label' ),
304 304
 						'parent' => null,
305 305
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
308 308
 					);
309 309
 				}
310 310
 
311
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
312
-					foreach ( $field['inputs'] as $input ) {
311
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
312
+					foreach ( $field[ 'inputs' ] as $input ) {
313 313
 
314
-						if( ! empty( $input['isHidden'] ) ) {
314
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
315 315
 							continue;
316 316
 						}
317 317
 
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
                          * @hack
320 320
                          * In case of email/email confirmation, the input for email has the same id as the parent field
321 321
                          */
322
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
322
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
323 323
                             continue;
324 324
                         }
325
-						$fields["{$input['id']}"] = array(
325
+						$fields[ "{$input[ 'id' ]}" ] = array(
326 326
 							'label' => \GV\Utils::get( $input, 'label' ),
327 327
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
328 328
 							'parent' => $field,
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 				}
335 335
 
336 336
 
337
-				if( GFCommon::is_product_field( $field['type'] ) ){
337
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
338 338
 					$has_product_fields = true;
339 339
 				}
340 340
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 		 * @since 1.7
349 349
 		 */
350 350
 		if ( $has_post_fields ) {
351
-			$fields['post_id'] = array(
351
+			$fields[ 'post_id' ] = array(
352 352
 				'label' => __( 'Post ID', 'gravityview' ),
353 353
 				'type' => 'post_id',
354 354
 			);
@@ -361,11 +361,11 @@  discard block
 block discarded – undo
361 361
 			foreach ( $payment_fields as $payment_field ) {
362 362
 
363 363
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
364
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
364
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
365 365
 					continue;
366 366
 				}
367 367
 
368
-				$fields["{$payment_field->name}"] = array(
368
+				$fields[ "{$payment_field->name}" ] = array(
369 369
 					'label' => $payment_field->label,
370 370
 					'desc' => $payment_field->description,
371 371
 					'type' => $payment_field->name,
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
397 397
 
398 398
 		$fields = array();
399 399
 
400
-		foreach ( $extra_fields as $key => $field ){
401
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
402
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
400
+		foreach ( $extra_fields as $key => $field ) {
401
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
402
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
403 403
 			}
404 404
 		}
405 405
 
@@ -439,33 +439,33 @@  discard block
 block discarded – undo
439 439
 			'search_criteria' => null,
440 440
 			'sorting' => null,
441 441
 			'paging' => null,
442
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
442
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
443 443
 			'context_view_id' => null,
444 444
 		);
445 445
 
446 446
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
447 447
 
448
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
449
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
448
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
449
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
450 450
 
451 451
 				if ( ! is_array( $filter ) ) {
452 452
 					continue;
453 453
 				}
454 454
 
455 455
 				// By default, we want searches to be wildcard for each field.
456
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
456
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
457 457
 
458 458
 				/**
459 459
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
460 460
 				 * @param string $operator Existing search operator
461 461
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
462 462
 				 */
463
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
463
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
464 464
 			}
465 465
 
466 466
 			// don't send just the [mode] without any field filter.
467
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
468
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
467
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
468
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
469 469
 			}
470 470
 
471 471
 		}
@@ -476,33 +476,33 @@  discard block
 block discarded – undo
476 476
 		 * Prepare date formats to be in Gravity Forms DB format;
477 477
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
478 478
 		 */
479
-		foreach ( array('start_date', 'end_date' ) as $key ) {
479
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
480 480
 
481
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
481
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
482 482
 
483 483
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
484
-				$date = date_create( $criteria['search_criteria'][ $key ] );
484
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
485 485
 
486 486
 				if ( $date ) {
487 487
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
488
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
488
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
489 489
 				} else {
490
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
490
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
491 491
 
492 492
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
493
-					unset( $criteria['search_criteria'][ $key ] );
493
+					unset( $criteria[ 'search_criteria' ][ $key ] );
494 494
 				}
495 495
 			}
496 496
 		}
497 497
 
498
-		if ( empty( $criteria['context_view_id'] ) ) {
498
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
499 499
 			// Calculate the context view id and send it to the advanced filter
500 500
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
501
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
501
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
502 502
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
503
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
503
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
504 504
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
505
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
505
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
506 506
 			}
507 507
 		}
508 508
 
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 		 * @param array $form_ids Forms to search
513 513
 		 * @param int $view_id ID of the view being used to search
514 514
 		 */
515
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
515
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
516 516
 
517 517
 		return (array)$criteria;
518 518
 	}
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		/** Reduce # of database calls */
547 547
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
548 548
 
549
-		if ( ! empty( $criteria['cache'] ) ) {
549
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
550 550
 
551 551
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
552 552
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 
555 555
 				// Still update the total count when using cached results
556 556
 				if ( ! is_null( $total ) ) {
557
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
557
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
558 558
 				}
559 559
 
560 560
 				$return = $entries;
@@ -576,9 +576,9 @@  discard block
 block discarded – undo
576 576
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
577 577
 
578 578
 			// No entries returned from gravityview_before_get_entries
579
-			if( is_null( $entries ) ) {
579
+			if ( is_null( $entries ) ) {
580 580
 
581
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
581
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
582 582
 
583 583
 				if ( is_wp_error( $entries ) ) {
584 584
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 				}
590 590
 			}
591 591
 
592
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
592
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
593 593
 
594 594
 				// Cache results
595 595
 				$Cache->set( $entries, 'entries' );
@@ -702,18 +702,18 @@  discard block
 block discarded – undo
702 702
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
703 703
 
704 704
 		// Is the entry allowed
705
-		if( $check_entry_display ) {
705
+		if ( $check_entry_display ) {
706 706
 
707 707
 			$gvid = \GV\Utils::_GET( 'gvid' );
708 708
 
709
-			if( $gvid ) {
709
+			if ( $gvid ) {
710 710
 				$view = \GV\View::by_id( $gvid );
711 711
 			}
712 712
 
713 713
 			$entry = self::check_entry_display( $entry, $view );
714 714
 		}
715 715
 
716
-		if( is_wp_error( $entry ) ) {
716
+		if ( is_wp_error( $entry ) ) {
717 717
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
718 718
 			return false;
719 719
 		}
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 
748 748
 		$value = false;
749 749
 
750
-		if( 'context' === $val1 ) {
750
+		if ( 'context' === $val1 ) {
751 751
 
752 752
 			$matching_contexts = array( $val2 );
753 753
 
754 754
 			// We allow for non-standard contexts.
755
-			switch( $val2 ) {
755
+			switch ( $val2 ) {
756 756
 				// Check for either single or edit
757 757
 				case 'singular':
758 758
 					$matching_contexts = array( 'single', 'edit' );
@@ -795,18 +795,18 @@  discard block
 block discarded – undo
795 795
 				$json_val_1 = json_decode( $val1, true );
796 796
 				$json_val_2 = json_decode( $val2, true );
797 797
 
798
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
798
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
799 799
 
800 800
 					$json_in = false;
801
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
802
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
801
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
802
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
803 803
 
804 804
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
805 805
 					foreach ( $json_val_1 as $item_1 ) {
806 806
 						foreach ( $json_val_2 as $item_2 ) {
807 807
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
808 808
 
809
-							if( $json_in ) {
809
+							if ( $json_in ) {
810 810
 								break 2;
811 811
 							}
812 812
 						}
@@ -857,10 +857,10 @@  discard block
 block discarded – undo
857 857
 	public static function check_entry_display( $entry, $view = null ) {
858 858
 
859 859
 		if ( ! $entry || is_wp_error( $entry ) ) {
860
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
860
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
861 861
 		}
862 862
 
863
-		if ( empty( $entry['form_id'] ) ) {
863
+		if ( empty( $entry[ 'form_id' ] ) ) {
864 864
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
865 865
 		}
866 866
 
@@ -875,19 +875,19 @@  discard block
 block discarded – undo
875 875
 
876 876
 		$_gvid = \GV\Utils::_GET( 'gvid' );
877 877
 
878
-		if ( $_gvid && $view->ID !== (int) $_gvid ) {
878
+		if ( $_gvid && $view->ID !== (int)$_gvid ) {
879 879
 			return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID );
880 880
 		}
881 881
 
882 882
 		$view_form_id = $view->form->ID;
883 883
 
884 884
 		if ( $view->joins ) {
885
-			if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
-				$view_form_id = $entry['form_id'];
885
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
+				$view_form_id = $entry[ 'form_id' ];
887 887
 			}
888 888
 		}
889 889
 
890
-		if ( (int) $view_form_id !== (int) $entry['form_id'] ) {
890
+		if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) {
891 891
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
892 892
 		}
893 893
 
@@ -895,13 +895,13 @@  discard block
 block discarded – undo
895 895
 		 * Check whether the entry is in the entries subset by running a modified query.
896 896
 		 */
897 897
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
898
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
898
+			$_tmp_query = new \GF_Query( $view_form_id, array(
899 899
 				'field_filters' => array(
900 900
 					'mode' => 'all',
901 901
 					array(
902 902
 						'key' => 'id',
903 903
 						'operation' => 'is',
904
-						'value' => $entry['id']
904
+						'value' => $entry[ 'id' ]
905 905
 					)
906 906
 				)
907 907
 			) );
@@ -911,14 +911,14 @@  discard block
 block discarded – undo
911 911
 			/** @type \GF_Query $query */
912 912
 			$query_parts      = $query->_introspect();
913 913
 
914
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
914
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
915 915
 
916 916
 		}, 10, 3 );
917 917
 
918 918
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
919 919
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
920 920
 
921
-			$criteria['paging'] = array(
921
+			$criteria[ 'paging' ] = array(
922 922
 				'offset' => 0,
923 923
 				'page_size' => 25
924 924
 			);
@@ -937,20 +937,20 @@  discard block
 block discarded – undo
937 937
 		}
938 938
 
939 939
 		// This entry is on a View with joins
940
-		if ( $entries[0]->is_multi() ) {
940
+		if ( $entries[ 0 ]->is_multi() ) {
941 941
 
942 942
 			$multi_entry_ids = array();
943 943
 
944
-			foreach ( $entries[0]->entries as $multi_entry ) {
945
-				$multi_entry_ids[] = (int) $multi_entry->ID;
944
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
945
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
946 946
 			}
947 947
 
948
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
948
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
949 949
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
950 950
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
951 951
 			}
952 952
 
953
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
953
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
954 954
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
955 955
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
956 956
 		}
@@ -995,18 +995,18 @@  discard block
 block discarded – undo
995 995
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
996 996
 		 * @see GFCommon::format_date() for original code
997 997
 		 */
998
-		$date_gmt_time   = mysql2date( 'G', $date_string );
998
+		$date_gmt_time = mysql2date( 'G', $date_string );
999 999
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
1000 1000
 
1001
-		$format  = \GV\Utils::get( $atts, 'format' );
1002
-		$is_human  = ! empty( $atts['human'] );
1003
-		$is_diff  = ! empty( $atts['diff'] );
1004
-		$is_raw = ! empty( $atts['raw'] );
1005
-		$is_timestamp = ! empty( $atts['timestamp'] );
1006
-		$include_time = ! empty( $atts['time'] );
1001
+		$format = \GV\Utils::get( $atts, 'format' );
1002
+		$is_human = ! empty( $atts[ 'human' ] );
1003
+		$is_diff = ! empty( $atts[ 'diff' ] );
1004
+		$is_raw = ! empty( $atts[ 'raw' ] );
1005
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
1006
+		$include_time = ! empty( $atts[ 'time' ] );
1007 1007
 
1008 1008
 		// If we're using time diff, we want to have a different default format
1009
-		if( empty( $format ) ) {
1009
+		if ( empty( $format ) ) {
1010 1010
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
1011 1011
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
1012 1012
 		}
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 		// If raw was specified, don't modify the stored value
1015 1015
 		if ( $is_raw ) {
1016 1016
 			$formatted_date = $date_string;
1017
-		} elseif( $is_timestamp ) {
1017
+		} elseif ( $is_timestamp ) {
1018 1018
 			$formatted_date = $date_local_timestamp;
1019 1019
 		} elseif ( $is_diff ) {
1020 1020
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 
1048 1048
 		$label = \GV\Utils::get( $field, 'label' );
1049 1049
 
1050
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1050
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1051 1051
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1052 1052
 		}
1053 1053
 
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
 			$form = GFAPI::get_form( $form );
1075 1075
 		}
1076 1076
 
1077
-		if ( class_exists( 'GFFormsModel' ) ){
1077
+		if ( class_exists( 'GFFormsModel' ) ) {
1078 1078
 			return GFFormsModel::get_field( $form, $field_id );
1079 1079
 		} else {
1080 1080
 			return null;
@@ -1121,19 +1121,19 @@  discard block
 block discarded – undo
1121 1121
 			$shortcodes = array();
1122 1122
 
1123 1123
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1124
-			if ( empty( $matches ) ){
1124
+			if ( empty( $matches ) ) {
1125 1125
 				return false;
1126 1126
 			}
1127 1127
 
1128 1128
 			foreach ( $matches as $shortcode ) {
1129
-				if ( $tag === $shortcode[2] ) {
1129
+				if ( $tag === $shortcode[ 2 ] ) {
1130 1130
 
1131 1131
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1132
-					$shortcodes[] = $shortcode;
1132
+					$shortcodes[ ] = $shortcode;
1133 1133
 
1134
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1135
-					foreach( $results as $result ) {
1136
-						$shortcodes[] = $result;
1134
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1135
+					foreach ( $results as $result ) {
1136
+						$shortcodes[ ] = $result;
1137 1137
 					}
1138 1138
 				}
1139 1139
 			}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			'post_type'      => 'gravityview',
1166 1166
 			'posts_per_page' => 100,
1167 1167
 			'meta_key'       => '_gravityview_form_id',
1168
-			'meta_value'     => (int) $form_id,
1168
+			'meta_value'     => (int)$form_id,
1169 1169
 		);
1170 1170
 		$args     = wp_parse_args( $args, $defaults );
1171 1171
 		$views    = get_posts( $args );
@@ -1177,21 +1177,21 @@  discard block
 block discarded – undo
1177 1177
 
1178 1178
 			$data = unserialize( $view->meta_value );
1179 1179
 
1180
-			if( ! $data || ! is_array( $data ) ) {
1180
+			if ( ! $data || ! is_array( $data ) ) {
1181 1181
 				continue;
1182 1182
 			}
1183 1183
 
1184 1184
 			foreach ( $data as $datum ) {
1185
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
1186
-					$joined_forms[] = $view->post_id;
1185
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
1186
+					$joined_forms[ ] = $view->post_id;
1187 1187
 				}
1188 1188
 			}
1189 1189
 		}
1190 1190
 
1191 1191
 		if ( $joined_forms ) {
1192
-			$joined_args  = array(
1192
+			$joined_args = array(
1193 1193
 				'post_type'      => 'gravityview',
1194
-				'posts_per_page' => $args['posts_per_page'],
1194
+				'posts_per_page' => $args[ 'posts_per_page' ],
1195 1195
 				'post__in'       => $joined_forms,
1196 1196
 			);
1197 1197
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
1347 1347
 
1348 1348
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1349 1349
 
1350
-		if( $json_decode ) {
1350
+		if ( $json_decode ) {
1351 1351
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1352 1352
 		}
1353 1353
 
@@ -1362,7 +1362,7 @@  discard block
 block discarded – undo
1362 1362
 	 * @return string         html
1363 1363
 	 */
1364 1364
 	public static function get_sortable_fields( $formid, $current = '' ) {
1365
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) .'</option>';
1365
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) . '</option>';
1366 1366
 
1367 1367
 		if ( empty( $formid ) ) {
1368 1368
 			return $output;
@@ -1375,11 +1375,11 @@  discard block
 block discarded – undo
1375 1375
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1376 1376
 
1377 1377
 			foreach ( $fields as $id => $field ) {
1378
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1378
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1379 1379
 					continue;
1380 1380
 				}
1381 1381
 
1382
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1382
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1383 1383
 			}
1384 1384
 		}
1385 1385
 
@@ -1418,16 +1418,16 @@  discard block
 block discarded – undo
1418 1418
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1419 1419
 
1420 1420
 		// TODO: Convert to using array_filter
1421
-		foreach( $fields as $id => $field ) {
1421
+		foreach ( $fields as $id => $field ) {
1422 1422
 
1423
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1423
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1424 1424
 				unset( $fields[ $id ] );
1425 1425
 			}
1426 1426
 
1427 1427
 			/**
1428 1428
 			 * Merge date and time subfields.
1429 1429
 			 */
1430
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
1430
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
1431 1431
 				$fields[ intval( $id ) ] = array(
1432 1432
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
1433 1433
 					'parent' => null,
@@ -1477,14 +1477,14 @@  discard block
 block discarded – undo
1477 1477
 	 * @param  int|array  $field field key or field array
1478 1478
 	 * @return boolean
1479 1479
 	 */
1480
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1480
+	public static function is_field_numeric( $form = null, $field = '' ) {
1481 1481
 
1482 1482
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1483 1483
 			$form = self::get_form( $form );
1484 1484
 		}
1485 1485
 
1486 1486
 		// If entry meta, it's a string. Otherwise, numeric
1487
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1487
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1488 1488
 			$type = $field;
1489 1489
 		} else {
1490 1490
 			$type = self::get_field_type( $form, $field );
@@ -1498,9 +1498,9 @@  discard block
 block discarded – undo
1498 1498
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1499 1499
 
1500 1500
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1501
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1502
-			if( true === $gv_field->is_numeric ) {
1503
-				$numeric_types[] = $gv_field->is_numeric;
1501
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1502
+			if ( true === $gv_field->is_numeric ) {
1503
+				$numeric_types[ ] = $gv_field->is_numeric;
1504 1504
 			}
1505 1505
 		}
1506 1506
 
@@ -1651,18 +1651,18 @@  discard block
 block discarded – undo
1651 1651
 		$final_atts = array_filter( $final_atts );
1652 1652
 
1653 1653
 		// If the href wasn't passed as an attribute, use the value passed to the function
1654
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1655
-			$final_atts['href'] = $href;
1654
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1655
+			$final_atts[ 'href' ] = $href;
1656 1656
 		}
1657 1657
 
1658
-		$final_atts['href'] = esc_url_raw( $href );
1658
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1659 1659
 
1660 1660
 		/**
1661 1661
 		 * Fix potential security issue with target=_blank
1662 1662
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1663 1663
 		 */
1664
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1664
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1666 1666
 		}
1667 1667
 
1668 1668
 		// Sort the attributes alphabetically, to help testing
@@ -1674,7 +1674,7 @@  discard block
 block discarded – undo
1674 1674
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1675 1675
 		}
1676 1676
 
1677
-		if( '' !== $output ) {
1677
+		if ( '' !== $output ) {
1678 1678
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1679 1679
 		}
1680 1680
 
@@ -1701,7 +1701,7 @@  discard block
 block discarded – undo
1701 1701
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1702 1702
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1703 1703
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1704
-				$merged[] = $value;
1704
+				$merged[ ] = $value;
1705 1705
 			} else {
1706 1706
 				$merged[ $key ] = $value;
1707 1707
 			}
@@ -1734,7 +1734,7 @@  discard block
 block discarded – undo
1734 1734
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1735 1735
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1736 1736
 		 */
1737
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1737
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1738 1738
 
1739 1739
 		return get_users( $get_users_settings );
1740 1740
 	}
@@ -1754,11 +1754,11 @@  discard block
 block discarded – undo
1754 1754
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1755 1755
 
1756 1756
     	// If $cap is defined, only show notice if user has capability
1757
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1757
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1758 1758
     		return '';
1759 1759
 	    }
1760 1760
 
1761
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1761
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1762 1762
     }
1763 1763
 
1764 1764
 	/**
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-total.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 *
51 51
 	 * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total.
52 52
 	 */
53
-	public function add_to_blacklist( $blacklist = array(), $context = NULL  ){
53
+	public function add_to_blacklist( $blacklist = array(), $context = NULL  ) {
54 54
 
55 55
 		if( empty( $context ) || $context !== 'edit' ) {
56 56
 			return $blacklist;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total.
52 52
 	 */
53
-	public function add_to_blacklist( $blacklist = array(), $context = NULL  ){
53
+	public function add_to_blacklist( $blacklist = array(), $context = NULL ) {
54 54
 
55
-		if( empty( $context ) || $context !== 'edit' ) {
55
+		if ( empty( $context ) || $context !== 'edit' ) {
56 56
 			return $blacklist;
57 57
 		}
58 58
 
59
-		$blacklist[] = 'total';
59
+		$blacklist[ ] = 'total';
60 60
 
61 61
 		return $blacklist;
62 62
 	}
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
76 76
 
77
-		$original_form = GFAPI::get_form( $form['id'] );
77
+		$original_form = GFAPI::get_form( $form[ 'id' ] );
78 78
 
79 79
 		$total_fields = GFCommon::get_fields_by_type( $original_form, 'total' );
80 80
 
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 
86 86
 			/** @type GF_Field_Total $total_field */
87 87
 			foreach ( $total_fields as $total_field ) {
88
-				$entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry );
88
+				$entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry );
89 89
 			}
90 90
 
91 91
 			$return_entry = GFAPI::update_entry( $entry );
92 92
 
93
-			if( is_wp_error( $return_entry ) ) {
93
+			if ( is_wp_error( $return_entry ) ) {
94 94
 				gravityview()->log->error( 'Updating the entry total fields failed', array( 'data' => $return_entry ) );
95 95
 			} else {
96 96
 				gravityview()->log->debug( 'Updating the entry total fields succeeded' );
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -313,6 +313,7 @@
 block discarded – undo
313 313
 	 * Add a callback for lazy loading/counting.
314 314
 	 *
315 315
 	 * @param callable $callback The callback to call when needed.
316
+	 * @param string $type
316 317
 	 *
317 318
 	 * @return void
318 319
 	 */
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
 		/** Call all lazy callbacks. */
106 106
 		foreach ( $this->callbacks as $callback ) {
107
-			if ( $callback[0] != 'count' ) {
107
+			if ( $callback[ 0 ] != 'count' ) {
108 108
 				continue;
109 109
 			}
110 110
 
111
-			$total += $callback[1]( $this->filters );
111
+			$total += $callback[ 1 ]( $this->filters );
112 112
 		}
113 113
 
114 114
 		if ( ! $total ) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
 		foreach ( $this->all() as $entry ) {
150 150
 			$entry = $entry->as_entry();
151
-			$result[] = Utils::get( $entry, $key, null );
151
+			$result[ ] = Utils::get( $entry, $key, null );
152 152
 		}
153 153
 
154 154
 		return $result;
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 
207 207
 		/** Call all lazy callbacks. */
208 208
 		foreach ( $this->callbacks as $i => $callback ) {
209
-			if ( $callback[0] != 'fetch' ) {
209
+			if ( $callback[ 0 ] != 'fetch' ) {
210 210
 				continue;
211 211
 			}
212 212
 
213
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
213
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
214 214
 		}
215 215
 
216 216
 		$this->fetched = parent::count();
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			return;
367 367
 		}
368 368
 
369
-		$this->callbacks []= array( $type, $callback );
369
+		$this->callbacks [ ] = array( $type, $callback );
370 370
 	}
371 371
 
372 372
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-collection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @return void
26 26
 	 */
27 27
 	public function add( $value ) {
28
-		$this->storage []= $value;
28
+		$this->storage [ ] = $value;
29 29
 	}
30 30
 
31 31
 	/**
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * @return void
50 50
 	 */
51 51
 	public function merge( \GV\Collection $collection ) {
52
-		array_map( array( $this, 'add'), $collection->all() );
52
+		array_map( array( $this, 'add' ), $collection->all() );
53 53
 	}
54 54
 
55 55
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-logger.php 3 patches
Indentation   +119 added lines, -119 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
  * Describes log levels.
11 11
  */
12 12
 class LogLevel {
13
-    const EMERGENCY = 'emergency';
14
-    const ALERT     = 'alert';
15
-    const CRITICAL  = 'critical';
16
-    const ERROR     = 'error';
17
-    const WARNING   = 'warning';
18
-    const NOTICE    = 'notice';
19
-    const INFO      = 'info';
20
-    const DEBUG     = 'debug';
13
+	const EMERGENCY = 'emergency';
14
+	const ALERT     = 'alert';
15
+	const CRITICAL  = 'critical';
16
+	const ERROR     = 'error';
17
+	const WARNING   = 'warning';
18
+	const NOTICE    = 'notice';
19
+	const INFO      = 'info';
20
+	const DEBUG     = 'debug';
21 21
 }
22 22
 
23 23
 /**
@@ -28,127 +28,127 @@  discard block
 block discarded – undo
28 28
  * @see https://github.com/php-fig/log/blob/master/Psr/Log/AbstractLogger.php
29 29
  */
30 30
 abstract class Logger /** @todo extends Psr\Log\AbstractLogger */ {
31
-    /**
32
-     * System is unusable.
33
-     *
34
-     * @param string $message
35
-     * @param array  $context
36
-     *
37
-     * @return void
38
-     */
39
-    public function emergency($message, array $context = array())
40
-    {
41
-        $this->log(LogLevel::EMERGENCY, $message, $context);
42
-    }
31
+	/**
32
+	 * System is unusable.
33
+	 *
34
+	 * @param string $message
35
+	 * @param array  $context
36
+	 *
37
+	 * @return void
38
+	 */
39
+	public function emergency($message, array $context = array())
40
+	{
41
+		$this->log(LogLevel::EMERGENCY, $message, $context);
42
+	}
43 43
 
44
-    /**
45
-     * Action must be taken immediately.
46
-     *
47
-     * Example: Entire website down, database unavailable, etc. This should
48
-     * trigger the SMS alerts and wake you up.
49
-     *
50
-     * @param string $message
51
-     * @param array  $context
52
-     *
53
-     * @return void
54
-     */
55
-    public function alert($message, array $context = array())
56
-    {
57
-        $this->log(LogLevel::ALERT, $message, $context);
58
-    }
44
+	/**
45
+	 * Action must be taken immediately.
46
+	 *
47
+	 * Example: Entire website down, database unavailable, etc. This should
48
+	 * trigger the SMS alerts and wake you up.
49
+	 *
50
+	 * @param string $message
51
+	 * @param array  $context
52
+	 *
53
+	 * @return void
54
+	 */
55
+	public function alert($message, array $context = array())
56
+	{
57
+		$this->log(LogLevel::ALERT, $message, $context);
58
+	}
59 59
 
60
-    /**
61
-     * Critical conditions.
62
-     *
63
-     * Example: Application component unavailable, unexpected exception.
64
-     *
65
-     * @param string $message
66
-     * @param array  $context
67
-     *
68
-     * @return void
69
-     */
70
-    public function critical($message, array $context = array())
71
-    {
72
-        $this->log(LogLevel::CRITICAL, $message, $context);
73
-    }
60
+	/**
61
+	 * Critical conditions.
62
+	 *
63
+	 * Example: Application component unavailable, unexpected exception.
64
+	 *
65
+	 * @param string $message
66
+	 * @param array  $context
67
+	 *
68
+	 * @return void
69
+	 */
70
+	public function critical($message, array $context = array())
71
+	{
72
+		$this->log(LogLevel::CRITICAL, $message, $context);
73
+	}
74 74
 
75
-    /**
76
-     * Runtime errors that do not require immediate action but should typically
77
-     * be logged and monitored.
78
-     *
79
-     * @param string $message
80
-     * @param array  $context
81
-     *
82
-     * @return void
83
-     */
84
-    public function error($message, array $context = array())
85
-    {
86
-        $this->log(LogLevel::ERROR, $message, $context);
87
-    }
75
+	/**
76
+	 * Runtime errors that do not require immediate action but should typically
77
+	 * be logged and monitored.
78
+	 *
79
+	 * @param string $message
80
+	 * @param array  $context
81
+	 *
82
+	 * @return void
83
+	 */
84
+	public function error($message, array $context = array())
85
+	{
86
+		$this->log(LogLevel::ERROR, $message, $context);
87
+	}
88 88
 
89
-    /**
90
-     * Exceptional occurrences that are not errors.
91
-     *
92
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
93
-     * that are not necessarily wrong.
94
-     *
95
-     * @param string $message
96
-     * @param array  $context
97
-     *
98
-     * @return void
99
-     */
100
-    public function warning($message, array $context = array())
101
-    {
102
-        $this->log(LogLevel::WARNING, $message, $context);
103
-    }
89
+	/**
90
+	 * Exceptional occurrences that are not errors.
91
+	 *
92
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
93
+	 * that are not necessarily wrong.
94
+	 *
95
+	 * @param string $message
96
+	 * @param array  $context
97
+	 *
98
+	 * @return void
99
+	 */
100
+	public function warning($message, array $context = array())
101
+	{
102
+		$this->log(LogLevel::WARNING, $message, $context);
103
+	}
104 104
 
105
-    /**
106
-     * Normal but significant events.
107
-     *
108
-     * @param string $message
109
-     * @param array  $context
110
-     *
111
-     * @return void
112
-     */
113
-    public function notice($message, array $context = array())
114
-    {
115
-        $this->log(LogLevel::NOTICE, $message, $context);
116
-    }
105
+	/**
106
+	 * Normal but significant events.
107
+	 *
108
+	 * @param string $message
109
+	 * @param array  $context
110
+	 *
111
+	 * @return void
112
+	 */
113
+	public function notice($message, array $context = array())
114
+	{
115
+		$this->log(LogLevel::NOTICE, $message, $context);
116
+	}
117 117
 
118
-    /**
119
-     * Interesting events.
120
-     *
121
-     * Example: User logs in, SQL logs.
122
-     *
123
-     * @param string $message
124
-     * @param array  $context
125
-     *
126
-     * @return void
127
-     */
128
-    public function info($message, array $context = array())
129
-    {
130
-        $this->log(LogLevel::INFO, $message, $context);
131
-    }
118
+	/**
119
+	 * Interesting events.
120
+	 *
121
+	 * Example: User logs in, SQL logs.
122
+	 *
123
+	 * @param string $message
124
+	 * @param array  $context
125
+	 *
126
+	 * @return void
127
+	 */
128
+	public function info($message, array $context = array())
129
+	{
130
+		$this->log(LogLevel::INFO, $message, $context);
131
+	}
132 132
 
133
-    /**
134
-     * Detailed debug information.
135
-     *
136
-     * @param string $message
137
-     * @param array  $context
138
-     *
139
-     * @return void
140
-     */
141
-    public function debug($message, array $context = array())
142
-    {
143
-        $this->log(LogLevel::DEBUG, $message, $context);
144
-    }
133
+	/**
134
+	 * Detailed debug information.
135
+	 *
136
+	 * @param string $message
137
+	 * @param array  $context
138
+	 *
139
+	 * @return void
140
+	 */
141
+	public function debug($message, array $context = array())
142
+	{
143
+		$this->log(LogLevel::DEBUG, $message, $context);
144
+	}
145 145
 
146 146
 	/**
147 147
 	 * Bake the context into { } placeholders in the message.
148
-     * @param string $message
149
-     * @param array  $context
150
-     *
151
-     * @return string The baked message;
148
+	 * @param string $message
149
+	 * @param array  $context
150
+	 *
151
+	 * @return string The baked message;
152 152
 	 */
153 153
 	protected function interpolate( $message, $context ) {
154 154
 		foreach ( $context as $key => $val ) {
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function emergency($message, array $context = array())
39
+    public function emergency( $message, array $context = array() )
40 40
     {
41
-        $this->log(LogLevel::EMERGENCY, $message, $context);
41
+        $this->log( LogLevel::EMERGENCY, $message, $context );
42 42
     }
43 43
 
44 44
     /**
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
      *
53 53
      * @return void
54 54
      */
55
-    public function alert($message, array $context = array())
55
+    public function alert( $message, array $context = array() )
56 56
     {
57
-        $this->log(LogLevel::ALERT, $message, $context);
57
+        $this->log( LogLevel::ALERT, $message, $context );
58 58
     }
59 59
 
60 60
     /**
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
      *
68 68
      * @return void
69 69
      */
70
-    public function critical($message, array $context = array())
70
+    public function critical( $message, array $context = array() )
71 71
     {
72
-        $this->log(LogLevel::CRITICAL, $message, $context);
72
+        $this->log( LogLevel::CRITICAL, $message, $context );
73 73
     }
74 74
 
75 75
     /**
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
      *
82 82
      * @return void
83 83
      */
84
-    public function error($message, array $context = array())
84
+    public function error( $message, array $context = array() )
85 85
     {
86
-        $this->log(LogLevel::ERROR, $message, $context);
86
+        $this->log( LogLevel::ERROR, $message, $context );
87 87
     }
88 88
 
89 89
     /**
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
      *
98 98
      * @return void
99 99
      */
100
-    public function warning($message, array $context = array())
100
+    public function warning( $message, array $context = array() )
101 101
     {
102
-        $this->log(LogLevel::WARNING, $message, $context);
102
+        $this->log( LogLevel::WARNING, $message, $context );
103 103
     }
104 104
 
105 105
     /**
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
      *
111 111
      * @return void
112 112
      */
113
-    public function notice($message, array $context = array())
113
+    public function notice( $message, array $context = array() )
114 114
     {
115
-        $this->log(LogLevel::NOTICE, $message, $context);
115
+        $this->log( LogLevel::NOTICE, $message, $context );
116 116
     }
117 117
 
118 118
     /**
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
      *
126 126
      * @return void
127 127
      */
128
-    public function info($message, array $context = array())
128
+    public function info( $message, array $context = array() )
129 129
     {
130
-        $this->log(LogLevel::INFO, $message, $context);
130
+        $this->log( LogLevel::INFO, $message, $context );
131 131
     }
132 132
 
133 133
     /**
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
      *
139 139
      * @return void
140 140
      */
141
-    public function debug($message, array $context = array())
141
+    public function debug( $message, array $context = array() )
142 142
     {
143
-        $this->log(LogLevel::DEBUG, $message, $context);
143
+        $this->log( LogLevel::DEBUG, $message, $context );
144 144
     }
145 145
 
146 146
 	/**
Please login to merge, or discard this patch.
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,8 +36,7 @@  discard block
 block discarded – undo
36 36
      *
37 37
      * @return void
38 38
      */
39
-    public function emergency($message, array $context = array())
40
-    {
39
+    public function emergency($message, array $context = array()) {
41 40
         $this->log(LogLevel::EMERGENCY, $message, $context);
42 41
     }
43 42
 
@@ -52,8 +51,7 @@  discard block
 block discarded – undo
52 51
      *
53 52
      * @return void
54 53
      */
55
-    public function alert($message, array $context = array())
56
-    {
54
+    public function alert($message, array $context = array()) {
57 55
         $this->log(LogLevel::ALERT, $message, $context);
58 56
     }
59 57
 
@@ -67,8 +65,7 @@  discard block
 block discarded – undo
67 65
      *
68 66
      * @return void
69 67
      */
70
-    public function critical($message, array $context = array())
71
-    {
68
+    public function critical($message, array $context = array()) {
72 69
         $this->log(LogLevel::CRITICAL, $message, $context);
73 70
     }
74 71
 
@@ -81,8 +78,7 @@  discard block
 block discarded – undo
81 78
      *
82 79
      * @return void
83 80
      */
84
-    public function error($message, array $context = array())
85
-    {
81
+    public function error($message, array $context = array()) {
86 82
         $this->log(LogLevel::ERROR, $message, $context);
87 83
     }
88 84
 
@@ -97,8 +93,7 @@  discard block
 block discarded – undo
97 93
      *
98 94
      * @return void
99 95
      */
100
-    public function warning($message, array $context = array())
101
-    {
96
+    public function warning($message, array $context = array()) {
102 97
         $this->log(LogLevel::WARNING, $message, $context);
103 98
     }
104 99
 
@@ -110,8 +105,7 @@  discard block
 block discarded – undo
110 105
      *
111 106
      * @return void
112 107
      */
113
-    public function notice($message, array $context = array())
114
-    {
108
+    public function notice($message, array $context = array()) {
115 109
         $this->log(LogLevel::NOTICE, $message, $context);
116 110
     }
117 111
 
@@ -125,8 +119,7 @@  discard block
 block discarded – undo
125 119
      *
126 120
      * @return void
127 121
      */
128
-    public function info($message, array $context = array())
129
-    {
122
+    public function info($message, array $context = array()) {
130 123
         $this->log(LogLevel::INFO, $message, $context);
131 124
     }
132 125
 
@@ -138,8 +131,7 @@  discard block
 block discarded – undo
138 131
      *
139 132
      * @return void
140 133
      */
141
-    public function debug($message, array $context = array())
142
-    {
134
+    public function debug($message, array $context = array()) {
143 135
         $this->log(LogLevel::DEBUG, $message, $context);
144 136
     }
145 137
 
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry-filter-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,10 +55,10 @@
 block discarded – undo
55 55
 						$search_criteria[ $key ] = $field_filters;
56 56
 					}
57 57
 
58
-					if ( ! empty( $b[ $key ]['mode'] ) ) {
59
-						$search_criteria[ $key ]['mode' ] = $b[ $key ]['mode'];
60
-					} else if ( ! empty( $a[ $key ]['mode'] ) ) {
61
-						$search_criteria[ $key ]['mode' ] = $a[ $key ]['mode'];
58
+					if ( ! empty( $b[ $key ][ 'mode' ] ) ) {
59
+						$search_criteria[ $key ][ 'mode' ] = $b[ $key ][ 'mode' ];
60
+					} else if ( ! empty( $a[ $key ][ 'mode' ] ) ) {
61
+						$search_criteria[ $key ][ 'mode' ] = $a[ $key ][ 'mode' ];
62 62
 					}
63 63
 					break;
64 64
 				case 'start_date':
Please login to merge, or discard this patch.