@@ -109,21 +109,21 @@ |
||
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); |
@@ -258,7 +258,8 @@ discard block |
||
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 |
||
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 |
@@ -43,7 +43,8 @@ |
||
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 |
@@ -36,13 +36,13 @@ discard block |
||
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 |
||
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 |
@@ -16,13 +16,15 @@ |
||
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 |
@@ -50,7 +50,8 @@ discard block |
||
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 |
||
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 |
@@ -6,36 +6,36 @@ |
||
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 |
@@ -28,7 +28,8 @@ |
||
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 |
@@ -29,7 +29,8 @@ discard block |
||
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 |
||
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 |
@@ -37,7 +37,8 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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' => __( '…' ) |
@@ -227,7 +232,8 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -247,58 +247,58 @@ |
||
247 | 247 | |
248 | 248 | $textdomain = Classy::textdomain(); |
249 | 249 | |
250 | - $archives_title = ''; |
|
250 | + $archives_title = ''; |
|
251 | 251 | |
252 | - if ( is_category() ) { |
|
252 | + if ( is_category() ) { |
|
253 | 253 | |
254 | - $archives_title = single_cat_title( '', false ); |
|
254 | + $archives_title = single_cat_title( '', false ); |
|
255 | 255 | |
256 | - } else if ( is_tag() ) { |
|
256 | + } else if ( is_tag() ) { |
|
257 | 257 | |
258 | - $archives_title = 'Tag: ' . single_tag_title( '', false ); |
|
258 | + $archives_title = 'Tag: ' . single_tag_title( '', false ); |
|
259 | 259 | |
260 | - } else if ( is_author() ) { |
|
260 | + } else if ( is_author() ) { |
|
261 | 261 | |
262 | - if ( have_posts() ) { |
|
262 | + if ( have_posts() ) { |
|
263 | 263 | |
264 | - the_post(); |
|
265 | - $archives_title = 'Author: ' . get_the_author(); |
|
264 | + the_post(); |
|
265 | + $archives_title = 'Author: ' . get_the_author(); |
|
266 | 266 | |
267 | - } |
|
267 | + } |
|
268 | 268 | |
269 | - rewind_posts(); |
|
269 | + rewind_posts(); |
|
270 | 270 | |
271 | - } else if ( is_search() ) { |
|
271 | + } else if ( is_search() ) { |
|
272 | 272 | |
273 | - $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' ); |
|
273 | + $archives_title = sprintf( __( 'Search Results for: %s', $textdomain ), '<span>' . get_search_query() . '</span>' ); |
|
274 | 274 | |
275 | - } else if ( is_archive() ) { |
|
275 | + } else if ( is_archive() ) { |
|
276 | 276 | |
277 | - if ( is_day() ) { |
|
277 | + if ( is_day() ) { |
|
278 | 278 | |
279 | - $archives_title = get_the_date(); |
|
279 | + $archives_title = get_the_date(); |
|
280 | 280 | |
281 | - } elseif ( is_month() ) { |
|
281 | + } elseif ( is_month() ) { |
|
282 | 282 | |
283 | - $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain )); |
|
283 | + $archives_title = get_the_date( _x( 'F Y', 'monthly archives date format', $textdomain )); |
|
284 | 284 | |
285 | - } elseif ( is_year() ) { |
|
285 | + } elseif ( is_year() ) { |
|
286 | 286 | |
287 | - $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain )); |
|
287 | + $archives_title = get_the_date( _x( 'Y', 'yearly archives date format', $textdomain )); |
|
288 | 288 | |
289 | - } else { |
|
289 | + } else { |
|
290 | 290 | |
291 | - $archives_title = 'Archives'; |
|
291 | + $archives_title = 'Archives'; |
|
292 | 292 | |
293 | - } |
|
293 | + } |
|
294 | 294 | |
295 | - } else { |
|
295 | + } else { |
|
296 | 296 | |
297 | - $archives_title = 'Archives'; |
|
297 | + $archives_title = 'Archives'; |
|
298 | 298 | |
299 | - } |
|
299 | + } |
|
300 | 300 | |
301 | - return $archives_title; |
|
301 | + return $archives_title; |
|
302 | 302 | |
303 | 303 | } |
304 | 304 |
@@ -70,7 +70,8 @@ discard block |
||
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 | |
@@ -139,7 +140,9 @@ discard block |
||
139 | 140 | return false; |
140 | 141 | } |
141 | 142 | |
142 | - if (!is_numeric($size)) $size = '92'; |
|
143 | + if (!is_numeric($size)) { |
|
144 | + $size = '92'; |
|
145 | + } |
|
143 | 146 | |
144 | 147 | |
145 | 148 | $email = $this->get_avatar_email(); |
@@ -154,7 +157,8 @@ discard block |
||
154 | 157 | |
155 | 158 | if (!empty($email)) { |
156 | 159 | $avatar = $this->get_avatar_url($default, $host, $email_hash, $size); |
157 | - } else { |
|
160 | + } |
|
161 | + else { |
|
158 | 162 | $avatar = $default; |
159 | 163 | } |
160 | 164 | |
@@ -174,7 +178,8 @@ discard block |
||
174 | 178 | |
175 | 179 | if ($user) { |
176 | 180 | $email = $user->user_email; |
177 | - } else { |
|
181 | + } |
|
182 | + else { |
|
178 | 183 | $email = $this->comment_author_email; |
179 | 184 | } |
180 | 185 | |
@@ -201,7 +206,8 @@ discard block |
||
201 | 206 | $avatar_default = get_option('avatar_default'); |
202 | 207 | if (empty($avatar_default)) { |
203 | 208 | $default = 'mystery'; |
204 | - } else { |
|
209 | + } |
|
210 | + else { |
|
205 | 211 | $default = $avatar_default; |
206 | 212 | } |
207 | 213 | } |
@@ -209,13 +215,17 @@ discard block |
||
209 | 215 | if ('mystery' == $default) { |
210 | 216 | $default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size; |
211 | 217 | // ad516503a11cd5ca435acc9bb6523536 == md5('[email protected]') |
212 | - } else if ('blank' == $default) { |
|
218 | + } |
|
219 | + else if ('blank' == $default) { |
|
213 | 220 | $default = $email ? 'blank' : includes_url('images/blank.gif'); |
214 | - } else if (!empty($email) && 'gravatar_default' == $default) { |
|
221 | + } |
|
222 | + else if (!empty($email) && 'gravatar_default' == $default) { |
|
215 | 223 | $default = ''; |
216 | - } else if ('gravatar_default' == $default) { |
|
224 | + } |
|
225 | + else if ('gravatar_default' == $default) { |
|
217 | 226 | $default = $host . '/avatar/?s=' . $size; |
218 | - } else if (empty($email) && !strstr($default, 'http://')) { |
|
227 | + } |
|
228 | + else if (empty($email) && !strstr($default, 'http://')) { |
|
219 | 229 | $default = $host . '/avatar/?d=' . $default . '&s=' . $size; |
220 | 230 | } |
221 | 231 | |
@@ -233,10 +243,12 @@ discard block |
||
233 | 243 | |
234 | 244 | if (is_ssl()) { |
235 | 245 | $host = 'https://secure.gravatar.com'; |
236 | - } else { |
|
246 | + } |
|
247 | + else { |
|
237 | 248 | if (!empty($email_hash)) { |
238 | 249 | $host = sprintf("http://%d.gravatar.com", (hexdec($email_hash[0]) % 2)); |
239 | - } else { |
|
250 | + } |
|
251 | + else { |
|
240 | 252 | $host = 'http://0.gravatar.com'; |
241 | 253 | } |
242 | 254 | } |
@@ -43,7 +43,8 @@ |
||
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 |