Completed
Pull Request — master (#2)
by
unknown
02:45
created
app/models/classy-post.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,7 +77,8 @@  discard block
 block discarded – undo
77 77
 		if ( is_integer( $post ) ) {
78 78
 			$this->ID = $post;
79 79
 			$this->init();
80
-		} elseif ( is_a( $post, 'WP_Post' ) ) {
80
+		}
81
+		elseif ( is_a( $post, 'WP_Post' ) ) {
81 82
 			$this->import( $post );
82 83
 		}
83 84
 	}
@@ -259,7 +260,8 @@  discard block
 block discarded – undo
259 260
 			if ( $force ) {
260 261
 				$text = ClassyHelper::trim_words( $this->post_excerpt, $len, false );
261 262
 				$trimmed = true;
262
-			} else {
263
+			}
264
+			else {
263 265
 				$text = $this->post_excerpt;
264 266
 			}
265 267
 		}
@@ -318,7 +320,8 @@  discard block
 block discarded – undo
318 320
 
319 321
 			if ( $readmore && isset( $readmore_matches ) && ! empty( $readmore_matches[1] ) ) {
320 322
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim( $readmore_matches[1] ) . '</a>';
321
-			} elseif ( $readmore ) {
323
+			}
324
+			elseif ( $readmore ) {
322 325
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim( $readmore ) . '</a>';
323 326
 			}
324 327
 
Please login to merge, or discard this patch.
app/classy/classy-query-helper.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,13 +16,15 @@
 block discarded – undo
16 16
 
17 17
 			return self::get_current_query();
18 18
 
19
-		} elseif ( is_array( $args ) ) {
19
+		}
20
+		elseif ( is_array( $args ) ) {
20 21
 
21 22
 			$args = array_merge( $default_args, $args );
22 23
 
23 24
 			return new WP_Query( $args );
24 25
 
25
-		} else {
26
+		}
27
+		else {
26 28
 
27 29
 			return new WP_Query( $default_args );
28 30
 
Please login to merge, or discard this patch.
app/classy/classy.php 1 patch
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -229,12 +229,14 @@  discard block
 block discarded – undo
229 229
 
230 230
 				$scope = array_merge( $common_scope, $data );
231 231
 
232
-			} else {
232
+			}
233
+			else {
233 234
 
234 235
 				$scope = $common_scope;
235 236
 
236 237
 			}
237
-		} else {
238
+		}
239
+		else {
238 240
 
239 241
 			$view = ClassyView::get_view();
240 242
 
@@ -283,11 +285,13 @@  discard block
 block discarded – undo
283 285
 
284 286
 					$_return[] = new ClassyPost( $post );
285 287
 
286
-				} elseif ( 'id' == $return_type ) {
288
+				}
289
+				elseif ( 'id' == $return_type ) {
287 290
 
288 291
 					$_return[] = $post->id;
289 292
 
290
-				} else {
293
+				}
294
+				else {
291 295
 
292 296
 					$_return[] = $post;
293 297
 
@@ -340,7 +344,8 @@  discard block
 block discarded – undo
340 344
 			$args['format'] = 'page/%#%';
341 345
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
342 346
 
343
-		} else {
347
+		}
348
+		else {
344 349
 			$big = 999999999;
345 350
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
346 351
 		}
@@ -352,7 +357,8 @@  discard block
 block discarded – undo
352 357
 
353 358
 		if ( is_int( $prefs ) ) {
354 359
 			$args['mid_size'] = $prefs - 2;
355
-		} else {
360
+		}
361
+		else {
356 362
 			$args = array_merge( $args, $prefs );
357 363
 		}
358 364
 
Please login to merge, or discard this patch.
app/classy/classy-helper.php 1 patch
Braces   +28 added lines, -14 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@  discard block
 block discarded – undo
37 37
 			preg_match_all( '/./u', $text, $words_array );
38 38
 			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
39 39
 			$sep = '';
40
-		} else {
40
+		}
41
+		else {
41 42
 			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
42 43
 			$sep = ' ';
43 44
 		}
@@ -46,7 +47,8 @@  discard block
 block discarded – undo
46 47
 			array_pop( $words_array );
47 48
 			$text = implode( $sep, $words_array );
48 49
 			$text = $text . $more;
49
-		} else {
50
+		}
51
+		else {
50 52
 			$text = implode( $sep, $words_array );
51 53
 		}
52 54
 
@@ -85,7 +87,8 @@  discard block
 block discarded – undo
85 87
 		for ( $i = 0; $i < $len_opened; $i++ ) {
86 88
 			if ( ! in_array( $openedtags[ $i ], $closedtags ) ) {
87 89
 				$html .= '</' . $openedtags[ $i ] . '>';
88
-			} else {
90
+			}
91
+			else {
89 92
 				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
90 93
 			}
91 94
 		}
@@ -170,7 +173,8 @@  discard block
 block discarded – undo
170 173
 					'current' => true,
171 174
 				);
172 175
 				$dots = true;
173
-			} else {
176
+			}
177
+			else {
174 178
 				if ( $args['show_all'] || ( $n <= $args['end_size'] || ( $args['current'] && $n >= $args['current'] - $args['mid_size'] && $n <= $args['current'] + $args['mid_size'] ) || $n > $args['total'] - $args['end_size'] ) ) {
175 179
 					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
176 180
 					$link = str_replace( '%#%', $n, $link );
@@ -188,7 +192,8 @@  discard block
 block discarded – undo
188 192
 						'current' => $args['current'] == $n,
189 193
 					);
190 194
 					$dots = true;
191
-				} elseif ( $dots && ! $args['show_all'] ) {
195
+				}
196
+				elseif ( $dots && ! $args['show_all'] ) {
192 197
 					$page_links[] = array(
193 198
 						'class' => 'dots',
194 199
 						'title' => __( '&hellip;' ),
@@ -227,7 +232,8 @@  discard block
 block discarded – undo
227 232
 			if ( strlen( $k ) ) {
228 233
 				if ( is_array( $v ) ) {
229 234
 					$obj->{$k} = self::array_to_object( $v ); //RECURSION
230
-				} else {
235
+				}
236
+				else {
231 237
 					$obj->{$k} = $v;
232 238
 				}
233 239
 			}
@@ -253,11 +259,13 @@  discard block
 block discarded – undo
253 259
 
254 260
 	        $archives_title = single_cat_title( '', false );
255 261
 
256
-	    } else if ( is_tag() ) {
262
+	    }
263
+	    else if ( is_tag() ) {
257 264
 
258 265
 	        $archives_title = 'Tag: ' . single_tag_title( '', false );
259 266
 
260
-	    } else if ( is_author() ) {
267
+	    }
268
+	    else if ( is_author() ) {
261 269
 
262 270
 	        if ( have_posts() ) {
263 271
 
@@ -268,30 +276,36 @@  discard block
 block discarded – undo
268 276
 
269 277
 	        rewind_posts();
270 278
 
271
-	    } else if ( is_search() ) {
279
+	    }
280
+	    else if ( is_search() ) {
272 281
 
273 282
 	        $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' );
274 283
 
275
-	    } else if ( is_archive() ) {
284
+	    }
285
+	    else if ( is_archive() ) {
276 286
 
277 287
 	        if ( is_day() ) {
278 288
 
279 289
 	            $archives_title = get_the_date();
280 290
 
281
-	        } elseif ( is_month() ) {
291
+	        }
292
+	        elseif ( is_month() ) {
282 293
 
283 294
 	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain ) );
284 295
 
285
-	        } elseif ( is_year() ) {
296
+	        }
297
+	        elseif ( is_year() ) {
286 298
 
287 299
 	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain ) );
288 300
 
289
-	        } else {
301
+	        }
302
+	        else {
290 303
 
291 304
 	            $archives_title = 'Archives';
292 305
 
293 306
 	        }
294
-		} else {
307
+		}
308
+		else {
295 309
 
296 310
 	        $archives_title = 'Archives';
297 311
 
Please login to merge, or discard this patch.
app/classy/classy-basis.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,8 @@
 block discarded – undo
28 28
 
29 29
 					$this->$key = $value;
30 30
 
31
-				} else if ( ! empty( $key ) && ! method_exists( $this, $key ) ) {
31
+				}
32
+				else if ( ! empty( $key ) && ! method_exists( $this, $key ) ) {
32 33
 
33 34
 					$this->$key = $value;
34 35
 
Please login to merge, or discard this patch.
app/classy/classy-menu.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,8 @@
 block discarded – undo
29 29
 
30 30
 			$menu_id = $this->check_menu_id( $arg );
31 31
 
32
-		} elseif ( is_string( $arg ) ) {
32
+		}
33
+		elseif ( is_string( $arg ) ) {
33 34
 
34 35
 			$menu_id = $this->get_menu_id_by_name( $arg );
35 36
 
Please login to merge, or discard this patch.
app/classy/classy-hierarchy.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,9 +54,11 @@  discard block
 block discarded – undo
54 54
 
55 55
 		elseif ( is_paged() ) : return 'paged';
56 56
 
57
-		else :
57
+		else {
58
+			:
58 59
 
59 60
 			return 'index';
61
+		}
60 62
 
61 63
 		endif;
62 64
 
@@ -95,7 +97,8 @@  discard block
 block discarded – undo
95 97
 
96 98
 			return THEME_PATH . $folder . '/' . $view . '.blade.php';
97 99
 
98
-		} elseif ( 'scope' == $type ) {
100
+		}
101
+		elseif ( 'scope' == $type ) {
99 102
 
100 103
 			$folder = ClassyScope::$folder;
101 104
 
@@ -232,7 +235,8 @@  discard block
 block discarded – undo
232 235
 
233 236
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
234 237
 
235
-				} else {
238
+				}
239
+				else {
236 240
 
237 241
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
238 242
 
@@ -343,9 +347,11 @@  discard block
 block discarded – undo
343 347
 
344 348
 			// Default
345 349
 
346
-		else :
350
+		else {
351
+			:
347 352
 
348 353
 			$views[] = $type;
354
+		}
349 355
 
350 356
 		endif;
351 357
 
Please login to merge, or discard this patch.
app/classy/classy-config.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@
 block discarded – undo
48 48
 
49 49
 					}
50 50
 				}
51
-			} else {
51
+			}
52
+			else {
52 53
 
53 54
 				die( 'There is no config file in ' . THEME . ' custom/config.php' );
54 55
 
Please login to merge, or discard this patch.
app/classy/classy-comment.php 1 patch
Braces   +20 added lines, -10 removed lines patch added patch discarded remove patch
@@ -70,7 +70,8 @@  discard block
 block discarded – undo
70 70
 
71 71
 			return new ClassyUser( $this->user_id );
72 72
 
73
-		} else {
73
+		}
74
+		else {
74 75
 
75 76
 			$author = new ClassyUser( 0 );
76 77
 
@@ -152,7 +153,8 @@  discard block
 block discarded – undo
152 153
 
153 154
 		if ( ! empty( $email ) ) {
154 155
 			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
155
-		} else {
156
+		}
157
+		else {
156 158
 			$avatar = $default;
157 159
 		}
158 160
 
@@ -172,7 +174,8 @@  discard block
 block discarded – undo
172 174
 
173 175
 		if ( $user ) {
174 176
 			$email = $user->user_email;
175
-		} else {
177
+		}
178
+		else {
176 179
 			$email = $this->comment_author_email;
177 180
 		}
178 181
 
@@ -199,7 +202,8 @@  discard block
 block discarded – undo
199 202
 			$avatar_default = get_option( 'avatar_default' );
200 203
 			if ( empty( $avatar_default ) ) {
201 204
 				$default = 'mystery';
202
-			} else {
205
+			}
206
+			else {
203 207
 				$default = $avatar_default;
204 208
 			}
205 209
 		}
@@ -207,13 +211,17 @@  discard block
 block discarded – undo
207 211
 		if ( 'mystery' == $default ) {
208 212
 			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
209 213
 			// ad516503a11cd5ca435acc9bb6523536 == md5('[email protected]')
210
-		} else if ( 'blank' == $default ) {
214
+		}
215
+		else if ( 'blank' == $default ) {
211 216
 			$default = $email ? 'blank' : includes_url( 'images/blank.gif' );
212
-		} else if ( ! empty( $email ) && 'gravatar_default' == $default ) {
217
+		}
218
+		else if ( ! empty( $email ) && 'gravatar_default' == $default ) {
213 219
 			$default = '';
214
-		} else if ( 'gravatar_default' == $default ) {
220
+		}
221
+		else if ( 'gravatar_default' == $default ) {
215 222
 			$default = $host . '/avatar/?s=' . $size;
216
-		} else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
223
+		}
224
+		else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
217 225
 			$default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
218 226
 		}
219 227
 
@@ -231,10 +239,12 @@  discard block
 block discarded – undo
231 239
 
232 240
 		if ( is_ssl() ) {
233 241
 			$host = 'https://secure.gravatar.com';
234
-		} else {
242
+		}
243
+		else {
235 244
 			if ( ! empty( $email_hash ) ) {
236 245
 				$host = sprintf( 'http://%d.gravatar.com', (hexdec( $email_hash[0] ) % 2) );
237
-			} else {
246
+			}
247
+			else {
238 248
 				$host = 'http://0.gravatar.com';
239 249
 			}
240 250
 		}
Please login to merge, or discard this patch.