Completed
Pull Request — develop (#1800)
by Zack
31:41 queued 11:38
created
includes/class-admin-welcome.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@
 block discarded – undo
12 12
  */
13 13
 
14 14
 // Exit if accessed directly
15
-if ( ! defined( 'ABSPATH' ) ) exit;
15
+if ( ! defined( 'ABSPATH' ) ) {
16
+	exit;
17
+}
16 18
 
17 19
 /**
18 20
  * GravityView_Welcome Class
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-password.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 	 *
50 50
 	 * @return string If a custom field label isn't set, return the field label for the password field
51 51
 	 */
52
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
52
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
53 53
 
54 54
 		// If using a custom label, no need to fetch the parent label
55 55
 		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {
Please login to merge, or discard this patch.
future/includes/class-gv-logger.php 1 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.
includes/widgets/search-widget/class-search-widget.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -603,7 +603,8 @@  discard block
 block discarded – undo
603 603
 				// Fast-forward 24 hour on the end time
604 604
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
605 605
 				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
606
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
606
+				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) {
607
+// See https://github.com/gravityview/GravityView/issues/1056
607 608
 					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
608 609
 				}
609 610
 			}
@@ -874,7 +875,7 @@  discard block
 block discarded – undo
874 875
 			'ymd_dot' => 'Y.m.d',
875 876
 		);
876 877
 
877
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
878
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
878 879
 			$format = $datepicker[ $field->dateFormat ];
879 880
 		}
880 881
 
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gravityview.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,9 @@
 block discarded – undo
79 79
 		 * Check permissions.
80 80
 		 */
81 81
 		while ( $error = $view->can_render( array( 'shortcode' ), $request ) ) {
82
-			if ( ! is_wp_error( $error ) )
83
-				break;
82
+			if ( ! is_wp_error( $error ) ) {
83
+							break;
84
+			}
84 85
 
85 86
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
86 87
 				case 'post_password_required':
Please login to merge, or discard this patch.
future/includes/class-gv-view.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,8 +230,9 @@
 block discarded – undo
230 230
 		 * Check permissions.
231 231
 		 */
232 232
 		while ( $error = $view->can_render( null, $request ) ) {
233
-			if ( ! is_wp_error( $error ) )
234
-				break;
233
+			if ( ! is_wp_error( $error ) ) {
234
+							break;
235
+			}
235 236
 
236 237
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
237 238
 				case 'post_password_required':
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '> ', '>', $placeholders['label_value'] ) ) ) );
1381 1381
 	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1382 1382
 
1383
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1383
+	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ) {
1384 1384
 		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1385 1385
 	}
1386 1386
 
@@ -1419,7 +1419,7 @@  discard block
 block discarded – undo
1419 1419
 	foreach ( $placeholders as $tag => $value ) {
1420 1420
 
1421 1421
 		// If the tag doesn't exist just skip it
1422
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1422
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1423 1423
 			continue;
1424 1424
 		}
1425 1425
 
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 		}
452 452
 
453 453
 		// WooCommerce doesn't $post_id
454
-		if ( empty( $passed_post_id ) )  {
454
+		if ( empty( $passed_post_id ) ) {
455 455
 			return $passed_title;
456 456
 		}
457 457
 
@@ -1206,7 +1206,7 @@  discard block
 block discarded – undo
1206 1206
 					 */
1207 1207
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1208 1208
 
1209
-					switch( strtolower( $address_part ) ){
1209
+					switch( strtolower( $address_part ) ) {
1210 1210
 						case 'street':
1211 1211
 							$sort_field_id .= '.1';
1212 1212
 							break;
@@ -1296,7 +1296,7 @@  discard block
 block discarded – undo
1296 1296
 		 */
1297 1297
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1298 1298
 
1299
-		if ( empty( $single_entry ) ){
1299
+		if ( empty( $single_entry ) ) {
1300 1300
 			return false;
1301 1301
 		} else {
1302 1302
 			return $single_entry;
Please login to merge, or discard this patch.
future/includes/class-gv-request.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@
 block discarded – undo
173 173
 			}
174 174
 
175 175
 			$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
176
-		}  else {
176
+		} else {
177 177
 			/**
178 178
 			 * A regular one.
179 179
 			 */
Please login to merge, or discard this patch.