Completed
Push — master ( ab4944...534e9c )
by Andrew
02:30
created
app/models/classy-post.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -109,21 +109,21 @@
 block discarded – undo
109 109
 	 * 
110 110
 	 * @return boolean
111 111
 	 */
112
-    public function can_edit() {
113
-        if ( !function_exists( 'current_user_can' ) ) {
114
-            return false;
115
-        }
116
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
117
-            return true;
118
-        }
119
-        return false;
120
-    }
121
-
122
-    /**
123
-     * Returns the Post Edit url
124
-     * 
125
-     * @return string
126
-     */
112
+	public function can_edit() {
113
+		if ( !function_exists( 'current_user_can' ) ) {
114
+			return false;
115
+		}
116
+		if ( current_user_can( 'edit_post', $this->ID ) ) {
117
+			return true;
118
+		}
119
+		return false;
120
+	}
121
+
122
+	/**
123
+	 * Returns the Post Edit url
124
+	 * 
125
+	 * @return string
126
+	 */
127 127
 	public function get_edit_url() {
128 128
 		if ( $this->can_edit() ) {
129 129
 			return get_edit_post_link($this->ID);
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -258,7 +258,8 @@  discard block
 block discarded – undo
258 258
 			if ( $force ) {
259 259
 				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
260 260
 				$trimmed = true;
261
-			} else {
261
+			}
262
+			else {
262 263
 				$text = $this->post_excerpt;
263 264
 			}
264 265
 
@@ -318,7 +319,8 @@  discard block
 block discarded – undo
318 319
 			
319 320
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
320 321
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore_matches[1]) . '</a>';
321
-			} elseif ( $readmore ) {
322
+			}
323
+			elseif ( $readmore ) {
322 324
 				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
323 325
 			}
324 326
 			
Please login to merge, or discard this patch.
app/appearance.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,8 @@
 block discarded – undo
43 43
 		
44 44
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
45 45
 		
46
-		} else {
46
+		}
47
+		else {
47 48
 			
48 49
 			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
49 50
 
Please login to merge, or discard this patch.
app/classy/classy-query-helper.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public static function get_current_query() {
38 38
 
39
-        global $wp_query;
39
+		global $wp_query;
40 40
 
41
-        $query =& $wp_query;
41
+		$query =& $wp_query;
42 42
 
43
-        $query = self::handle_maybe_custom_posts_page($query);
43
+		$query = self::handle_maybe_custom_posts_page($query);
44 44
 
45
-        return $query;
45
+		return $query;
46 46
 
47 47
 	}
48 48
 
@@ -52,20 +52,20 @@  discard block
 block discarded – undo
52 52
 	 * @param  object $query WP_Query
53 53
 	 * @return object        WP_Query
54 54
 	 */
55
-    private static function handle_maybe_custom_posts_page( $query ) {
55
+	private static function handle_maybe_custom_posts_page( $query ) {
56 56
 
57
-    	if ($custom_posts_page = get_option('page_for_posts')) {
57
+		if ($custom_posts_page = get_option('page_for_posts')) {
58 58
         
59
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
59
+			if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
60 60
         
61
-        		return new WP_Query(array('post_type' => 'post'));
61
+				return new WP_Query(array('post_type' => 'post'));
62 62
         
63
-        	}
63
+			}
64 64
         
65
-        }
65
+		}
66 66
         
67
-        return $query;
67
+		return $query;
68 68
 
69
-    }
69
+	}
70 70
 
71 71
 }
72 72
\ No newline at end of file
Please login to merge, or discard this 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-config.php 1 patch
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,7 +50,8 @@  discard block
 block discarded – undo
50 50
 
51 51
 				}
52 52
 
53
-			} else {
53
+			}
54
+			else {
54 55
 
55 56
 				die('There is no config file in ' . THEME . ' custom/config.php');
56 57
 
@@ -73,16 +74,24 @@  discard block
 block discarded – undo
73 74
 		$vars = self::get_vars();
74 75
 
75 76
 		// Init Post Types
76
-		if (isset($vars['post_types'])) self::init_post_types( $vars['post_types'] );
77
+		if (isset($vars['post_types'])) {
78
+			self::init_post_types( $vars['post_types'] );
79
+		}
77 80
 
78 81
 		// Init Taxonomies
79
-		if (isset($vars['taxonomies'])) self::init_taxonomies( $vars['taxonomies'] );
82
+		if (isset($vars['taxonomies'])) {
83
+			self::init_taxonomies( $vars['taxonomies'] );
84
+		}
80 85
 
81 86
 		// Init Post Formats
82
-		if (isset($vars['post_formats'])) self::init_post_formats( $vars['post_formats'] );
87
+		if (isset($vars['post_formats'])) {
88
+			self::init_post_formats( $vars['post_formats'] );
89
+		}
83 90
 
84 91
 		// Init Sidebars
85
-		if (isset($vars['sidebars'])) self::init_sidebars( $vars['sidebars'] );
92
+		if (isset($vars['sidebars'])) {
93
+			self::init_sidebars( $vars['sidebars'] );
94
+		}
86 95
 		
87 96
 	}
88 97
 
Please login to merge, or discard this patch.
app/classy/classy-basis.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -6,36 +6,36 @@
 block discarded – undo
6 6
 
7 7
 class ClassyBasis {
8 8
 
9
-    /**
10
-     * Imports data params into the class instance
11
-     * 
12
-     * @param  object/array $data
13
-     * @return void
14
-     */
9
+	/**
10
+	 * Imports data params into the class instance
11
+	 * 
12
+	 * @param  object/array $data
13
+	 * @return void
14
+	 */
15 15
 	protected function import($data) {
16 16
 
17
-        if ( is_object( $data ) ) {
17
+		if ( is_object( $data ) ) {
18 18
         
19
-            $data = get_object_vars( $data );
19
+			$data = get_object_vars( $data );
20 20
         
21
-        }
21
+		}
22 22
 
23
-        if ( is_array( $data ) ) {
23
+		if ( is_array( $data ) ) {
24 24
             
25
-            foreach ( $data as $key => $value ) {
25
+			foreach ( $data as $key => $value ) {
26 26
             
27
-                if ( !empty( $key ) ) {
27
+				if ( !empty( $key ) ) {
28 28
             
29
-                    $this->$key = $value;
29
+					$this->$key = $value;
30 30
             
31
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
31
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
32 32
             
33
-                    $this->$key = $value;
33
+					$this->$key = $value;
34 34
             
35
-                }
36
-            }
35
+				}
36
+			}
37 37
 
38
-        }
38
+		}
39 39
 
40 40
 	}
41 41
 
Please login to merge, or discard this 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   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,7 +29,8 @@  discard block
 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
 
@@ -148,11 +149,15 @@  discard block
 block discarded – undo
148 149
 			
149 150
 			$menu_id = get_term_by('slug', $slug, 'nav_menu');
150 151
 
151
-			if ($menu_id) return $menu_id;
152
+			if ($menu_id) {
153
+				return $menu_id;
154
+			}
152 155
 
153 156
 			$menu_id = get_term_by('name', $slug, 'nav_menu');
154 157
 			
155
-			if ($menu_id) return $menu_id;
158
+			if ($menu_id) {
159
+				return $menu_id;
160
+			}
156 161
 
157 162
 		}
158 163
 
Please login to merge, or discard this patch.
app/classy/classy.php 1 patch
Braces   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -146,7 +146,9 @@  discard block
 block discarded – undo
146 146
 	public static function get_config_var($name) {
147 147
 		$vars = ClassyConfig::get_vars();
148 148
 
149
-		if (isset($vars[$name])) return $vars[$name];
149
+		if (isset($vars[$name])) {
150
+			return $vars[$name];
151
+		}
150 152
 
151 153
 		return false;
152 154
 	}
@@ -207,11 +209,13 @@  discard block
 block discarded – undo
207 209
 				
208 210
 					$_return[] = new ClassyPost($post_id);
209 211
 				
210
-				} elseif($return_type == 'object') {
212
+				}
213
+				elseif($return_type == 'object') {
211 214
 
212 215
 					$_return[] = get_post($post_id);
213 216
 
214
-				} else {
217
+				}
218
+				else {
215 219
 
216 220
 					$_return[] = $post_id;
217 221
 
@@ -263,7 +267,8 @@  discard block
 block discarded – undo
263 267
 			$args['format'] = 'page/%#%';
264 268
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
265 269
 
266
-		} else {
270
+		}
271
+		else {
267 272
 			$big = 999999999;
268 273
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
269 274
 		}
@@ -275,7 +280,8 @@  discard block
 block discarded – undo
275 280
 		
276 281
 		if ( is_int( $prefs ) ) {
277 282
 			$args['mid_size'] = $prefs - 2;
278
-		} else {
283
+		}
284
+		else {
279 285
 			$args = array_merge( $args, $prefs );
280 286
 		}
281 287
 
Please login to merge, or discard this patch.
app/classy/classy-helper.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -245,58 +245,58 @@
 block discarded – undo
245 245
 	 */
246 246
 	public static function get_archives_title() {
247 247
 
248
-	    $archives_title = '';
248
+		$archives_title = '';
249 249
 
250
-	    if ( is_category() ) {
250
+		if ( is_category() ) {
251 251
 
252
-	        $archives_title = single_cat_title( '', false );
252
+			$archives_title = single_cat_title( '', false );
253 253
 	    
254
-	    } else if ( is_tag() ) {
254
+		} else if ( is_tag() ) {
255 255
 
256
-	        $archives_title = 'Tag: ' . single_tag_title( '', false );
256
+			$archives_title = 'Tag: ' . single_tag_title( '', false );
257 257
 	    
258
-	    } else if ( is_author() ) {
258
+		} else if ( is_author() ) {
259 259
 
260
-	        if ( have_posts() ) {
260
+			if ( have_posts() ) {
261 261
 	        
262
-	            the_post();
263
-	            $archives_title = 'Author: ' . get_the_author();
262
+				the_post();
263
+				$archives_title = 'Author: ' . get_the_author();
264 264
 	        
265
-	        }
265
+			}
266 266
 	        
267
-	        rewind_posts();
267
+			rewind_posts();
268 268
 
269
-	    } else if ( is_search() ) {
269
+		} else if ( is_search() ) {
270 270
 
271
-	        $archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
271
+			$archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
272 272
 	    
273
-	    } else if ( is_archive() ) {
273
+		} else if ( is_archive() ) {
274 274
 	        
275
-	        if ( is_day() ) {
275
+			if ( is_day() ) {
276 276
 	        
277
-	            $archives_title = get_the_date();
277
+				$archives_title = get_the_date();
278 278
 	        
279
-	        } elseif ( is_month() ) {
279
+			} elseif ( is_month() ) {
280 280
 	        
281
-	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
281
+				$archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
282 282
 	        
283
-	        } elseif ( is_year() ) {
283
+			} elseif ( is_year() ) {
284 284
 	        
285
-	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
285
+				$archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
286 286
 	        
287
-	        } else {
287
+			} else {
288 288
 	        
289
-	            $archives_title = 'Archives';
289
+				$archives_title = 'Archives';
290 290
 	        
291
-	        }
291
+			}
292 292
 	    
293
-	    } else {
293
+		} else {
294 294
 	    
295
-	        $archives_title = 'Archives';
295
+			$archives_title = 'Archives';
296 296
 	    
297
-	    }
297
+		}
298 298
 
299
-	    return $archives_title;
299
+		return $archives_title;
300 300
 
301 301
 	}
302 302
 
Please login to merge, or discard this 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
 			}
@@ -251,11 +257,13 @@  discard block
 block discarded – undo
251 257
 
252 258
 	        $archives_title = single_cat_title( '', false );
253 259
 	    
254
-	    } else if ( is_tag() ) {
260
+	    }
261
+	    else if ( is_tag() ) {
255 262
 
256 263
 	        $archives_title = 'Tag: ' . single_tag_title( '', false );
257 264
 	    
258
-	    } else if ( is_author() ) {
265
+	    }
266
+	    else if ( is_author() ) {
259 267
 
260 268
 	        if ( have_posts() ) {
261 269
 	        
@@ -266,31 +274,37 @@  discard block
 block discarded – undo
266 274
 	        
267 275
 	        rewind_posts();
268 276
 
269
-	    } else if ( is_search() ) {
277
+	    }
278
+	    else if ( is_search() ) {
270 279
 
271 280
 	        $archives_title = sprintf( __( 'Search Results for: %s', 'flotheme' ), '<span>' . get_search_query() . '</span>' );
272 281
 	    
273
-	    } else if ( is_archive() ) {
282
+	    }
283
+	    else if ( is_archive() ) {
274 284
 	        
275 285
 	        if ( is_day() ) {
276 286
 	        
277 287
 	            $archives_title = get_the_date();
278 288
 	        
279
-	        } elseif ( is_month() ) {
289
+	        }
290
+	        elseif ( is_month() ) {
280 291
 	        
281 292
 	            $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', 'flotheme'));
282 293
 	        
283
-	        } elseif ( is_year() ) {
294
+	        }
295
+	        elseif ( is_year() ) {
284 296
 	        
285 297
 	            $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', 'flotheme'));
286 298
 	        
287
-	        } else {
299
+	        }
300
+	        else {
288 301
 	        
289 302
 	            $archives_title = 'Archives';
290 303
 	        
291 304
 	        }
292 305
 	    
293
-	    } else {
306
+	    }
307
+	    else {
294 308
 	    
295 309
 	        $archives_title = 'Archives';
296 310
 	    
Please login to merge, or discard this patch.
app/classy/classy-template.php 1 patch
Braces   +38 added lines, -22 removed lines patch added patch discarded remove patch
@@ -155,7 +155,8 @@  discard block
 block discarded – undo
155 155
 				
156 156
 					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
157 157
 				
158
-				} else {
158
+				}
159
+				else {
159 160
 				
160 161
 					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
161 162
 				
@@ -208,18 +209,22 @@  discard block
 block discarded – undo
208 209
 			if ( ! $pagename && $id ) {
209 210
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
210 211
 				$post = get_queried_object();
211
-				if ( $post )
212
-					$pagename = $post->post_name;
212
+				if ( $post ) {
213
+									$pagename = $post->post_name;
214
+				}
213 215
 			}
214 216
 
215 217
 			$template = get_post_meta('theme-page-template', $id);
216 218
 
217
-			if ( $template != 'index' )
218
-				$templates[] = $template;
219
-			if ( $pagename )
220
-				$templates[] = "page-$pagename";
221
-			if ( $id )
222
-				$templates[] = "page-$id";
219
+			if ( $template != 'index' ) {
220
+							$templates[] = $template;
221
+			}
222
+			if ( $pagename ) {
223
+							$templates[] = "page-$pagename";
224
+			}
225
+			if ( $id ) {
226
+							$templates[] = "page-$id";
227
+			}
223 228
 			$templates[] = '';
224 229
 
225 230
 		// Page
@@ -235,24 +240,30 @@  discard block
 block discarded – undo
235 240
 			if ( ! $pagename && $id ) {
236 241
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
237 242
 				$post = get_queried_object();
238
-				if ( $post )
239
-					$pagename = $post->post_name;
243
+				if ( $post ) {
244
+									$pagename = $post->post_name;
245
+				}
240 246
 			}
241 247
 
242
-			if ( $template != 'index' )
243
-				$templates[] = $template;
244
-			if ( $pagename )
245
-				$templates[] = "page-$pagename";
246
-			if ( $id )
247
-				$templates[] = "page-$id";
248
+			if ( $template != 'index' ) {
249
+							$templates[] = $template;
250
+			}
251
+			if ( $pagename ) {
252
+							$templates[] = "page-$pagename";
253
+			}
254
+			if ( $id ) {
255
+							$templates[] = "page-$id";
256
+			}
248 257
 			$templates[] = 'page';
249 258
 
250 259
 
251 260
 		// Default
252 261
 
253
-		else:
262
+		else {
263
+			:
254 264
 
255 265
 			$templates[] = $type;
266
+		}
256 267
 
257 268
 		endif;
258 269
 
@@ -301,9 +312,11 @@  discard block
 block discarded – undo
301 312
 
302 313
 		elseif ( is_paged() && $template = self::get_available_template('paged') ) :
303 314
 
304
-		else :
315
+		else {
316
+			:
305 317
 		
306 318
 			$template = 'index';
319
+		}
307 320
 
308 321
 		endif;
309 322
 
@@ -324,7 +337,8 @@  discard block
 block discarded – undo
324 337
 
325 338
 			return $template;	
326 339
 
327
-		} else {
340
+		}
341
+		else {
328 342
 
329 343
 			return $template . '.' . $template;
330 344
 			
@@ -378,13 +392,15 @@  discard block
 block discarded – undo
378 392
 
379 393
 				$scope = array_merge($common_scope, $data);
380 394
 
381
-			} else {
395
+			}
396
+			else {
382 397
 
383 398
 				$scope = $common_scope;
384 399
 
385 400
 			}
386 401
 
387
-		} else {
402
+		}
403
+		else {
388 404
 
389 405
 			$current_page = self::get_current_page();
390 406
 
Please login to merge, or discard this patch.