Completed
Push — master ( 7733bc...b90e50 )
by Andrew
9s
created
app/classy/classy.php 3 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,6 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * 
55 55
 	 * @param  string
56 56
 	 * @param  string
57
+	 * @param string $name
57 58
 	 */
58 59
 	private function define( $name, $value ) {
59 60
 		if ( !defined($name) ) {
@@ -241,7 +242,7 @@  discard block
 block discarded – undo
241 242
 
242 243
 	/**
243 244
 	 * @param array   $prefs
244
-	 * @return array mixed
245
+	 * @return stdClass mixed
245 246
 	 */
246 247
 	public static function get_pagination( $prefs = array() ) {
247 248
 		global $wp_query;
Please login to merge, or discard this patch.
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public static function get_instance() {
31 31
 
32
-		if ( null === self::$single_instance ) {
32
+		if (null === self::$single_instance) {
33 33
 
34 34
 			self::$single_instance = new self();
35 35
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 		$this->init_config();
58 58
 
59
-		add_filter( 'theme_page_templates', array( $this, 'filter_templates' ), 3 );
59
+		add_filter('theme_page_templates', array($this, 'filter_templates'), 3);
60 60
 
61 61
 	}
62 62
 
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 	 * @param  string
67 67
 	 * @param  string
68 68
 	 */
69
-	private function define( $name, $value ) {
69
+	private function define($name, $value) {
70 70
 
71
-		if ( ! defined( $name ) ) {
71
+		if (!defined($name)) {
72 72
 
73
-			define( $name, $value );
73
+			define($name, $value);
74 74
 
75 75
 		}
76 76
 
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$theme = wp_get_theme();
88 88
 
89
-		$this->define( 'THEME', $theme->template );
90
-		$this->define( 'THEME_NAME', $theme->get( 'Name' ) );
91
-		$this->define( 'THEME_PATH', get_template_directory() . '/' );
92
-		$this->define( 'THEME_DIR', get_template_directory_uri() . '/' );
93
-		$this->define( 'THEME_VERSION', $theme->get( 'Version' ) );
94
-		$this->define( 'THEME_FRAMEWORK_PATH', THEME_PATH . 'app/' );
95
-		$this->define( 'THEME_FRAMEWORK_DIR', THEME_DIR . 'app/' );
89
+		$this->define('THEME', $theme->template);
90
+		$this->define('THEME_NAME', $theme->get('Name'));
91
+		$this->define('THEME_PATH', get_template_directory().'/');
92
+		$this->define('THEME_DIR', get_template_directory_uri().'/');
93
+		$this->define('THEME_VERSION', $theme->get('Version'));
94
+		$this->define('THEME_FRAMEWORK_PATH', THEME_PATH.'app/');
95
+		$this->define('THEME_FRAMEWORK_DIR', THEME_DIR.'app/');
96 96
 
97 97
 	}
98 98
 
@@ -101,40 +101,40 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function include_core_files() {
103 103
 
104
-		require_once THEME_PATH . 'vendor/autoload.php';
104
+		require_once THEME_PATH.'vendor/autoload.php';
105 105
 
106 106
 		// Basis Class
107
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-basis.php';
107
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-basis.php';
108 108
 
109 109
 		// Hierarchy
110
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-hierarchy.php';
110
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-hierarchy.php';
111 111
 
112 112
 		// Theme Config
113
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-config.php';
113
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-config.php';
114 114
 
115 115
 		// Scope
116
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-scope.php';
116
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-scope.php';
117 117
 
118 118
 		// View Loader
119
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-view.php';
119
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-view.php';
120 120
 
121 121
 		// Helper functions
122
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-helper.php';
122
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-helper.php';
123 123
 
124 124
 		// Query Helper
125
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-query-helper.php';
125
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-query-helper.php';
126 126
 
127 127
 		// Menu
128
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu.php';
128
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu.php';
129 129
 
130 130
 		// Menu Item
131
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu-item.php';
131
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu-item.php';
132 132
 
133 133
 		// Comment
134
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-comment.php';
134
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-comment.php';
135 135
 
136 136
 		// Appearance
137
-		require_once THEME_FRAMEWORK_PATH . 'appearance.php';
137
+		require_once THEME_FRAMEWORK_PATH.'appearance.php';
138 138
 
139 139
 	}
140 140
 
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	private function include_models() {
145 145
 
146
-		$files = (array) glob( THEME_FRAMEWORK_PATH . '/models/*.php' );
146
+		$files = (array) glob(THEME_FRAMEWORK_PATH.'/models/*.php');
147 147
 
148
-		foreach ( $files as $filename ) {
148
+		foreach ($files as $filename) {
149 149
 
150
-			if ( ! empty( $filename ) ) {
150
+			if (!empty($filename)) {
151 151
 
152 152
 				require_once $filename;
153 153
 
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
 	 * @return array
172 172
 	 */
173 173
 
174
-	public function filter_templates( $page_templates = array(), $object = null, $post = null ) {
174
+	public function filter_templates($page_templates = array(), $object = null, $post = null) {
175 175
 
176 176
 		$custom_templates = ClassyView::get_page_templates_list();
177 177
 
178
-		return array_merge( $page_templates, $custom_templates );
178
+		return array_merge($page_templates, $custom_templates);
179 179
 
180 180
 	}
181 181
 
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 	 * @param  string $name
186 186
 	 * @return any
187 187
 	 */
188
-	public static function get_config_var( $name ) {
188
+	public static function get_config_var($name) {
189 189
 
190 190
 		$vars = ClassyConfig::get_vars();
191 191
 
192
-		if ( isset( $vars[ $name ] ) ) { return $vars[ $name ]; }
192
+		if (isset($vars[$name])) { return $vars[$name]; }
193 193
 
194 194
 		return false;
195 195
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public static function textdomain() {
204 204
 
205
-		$textdomain = Classy::get_config_var( 'textdomain' );
205
+		$textdomain = Classy::get_config_var('textdomain');
206 206
 
207 207
 		return $textdomain ? $textdomain : THEME;
208 208
 
@@ -217,17 +217,17 @@  discard block
 block discarded – undo
217 217
 	 * @param  array|null  $data     Additional params
218 218
 	 * @return void
219 219
 	 */
220
-	public static function render( $view = null, $data = null ) {
220
+	public static function render($view = null, $data = null) {
221 221
 
222
-		$views = THEME_PATH . ClassyView::$folder;
223
-		$cache = WP_CONTENT_DIR . '/viewcache';
222
+		$views = THEME_PATH.ClassyView::$folder;
223
+		$cache = WP_CONTENT_DIR.'/viewcache';
224 224
 		$common_scope = ClassyScope::get_common_scope();
225 225
 
226
-		if ( null !== $view && is_string( $view ) ) {
226
+		if (null !== $view && is_string($view)) {
227 227
 
228
-			if ( $data && is_array( $data ) ) {
228
+			if ($data && is_array($data)) {
229 229
 
230
-				$scope = array_merge( $common_scope, $data );
230
+				$scope = array_merge($common_scope, $data);
231 231
 
232 232
 			} else {
233 233
 
@@ -242,9 +242,9 @@  discard block
 block discarded – undo
242 242
 
243 243
 		}
244 244
 
245
-		$renderer = new BladeRenderer( $views, array( 'cache_path' => $cache ) );
245
+		$renderer = new BladeRenderer($views, array('cache_path' => $cache));
246 246
 
247
-		echo $renderer->render( $view, $scope );
247
+		echo $renderer->render($view, $scope);
248 248
 
249 249
 	}
250 250
 
@@ -269,27 +269,27 @@  discard block
 block discarded – undo
269 269
 	 * @param  string  $return object/id/ClassyPost
270 270
 	 * @return mixed
271 271
 	 */
272
-	public static function get_posts( $args = false, $return = 'ClassyPost' ) {
272
+	public static function get_posts($args = false, $return = 'ClassyPost') {
273 273
 
274 274
 		$_return = array();
275 275
 
276
-		$query = ClassyQueryHelper::find_query( $args );
276
+		$query = ClassyQueryHelper::find_query($args);
277 277
 
278
-		if ( isset( $query->posts ) ) {
278
+		if (isset($query->posts)) {
279 279
 
280
-			foreach ( $query->posts as $post ) {
280
+			foreach ($query->posts as $post) {
281 281
 
282
-				if ( 'id' == $return ) {
282
+				if ('id' == $return) {
283 283
 
284 284
 					$_return[] = $post->id;
285 285
 
286
-				} elseif ( 'object' == $return ) {
286
+				} elseif ('object' == $return) {
287 287
 
288 288
 					$_return[] = $post;
289 289
 
290
-				} elseif ( class_exists( $return ) ) {
290
+				} elseif (class_exists($return)) {
291 291
 
292
-					$_return[] = new $return( $post );
292
+					$_return[] = new $return($post);
293 293
 
294 294
 				}
295 295
 			}
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 	 * @param  string  $return_type ClassyPost/object/id
307 307
 	 * @return mixed
308 308
 	 */
309
-	public static function get_post( $args = false, $return_type = 'ClassyPost' ) {
309
+	public static function get_post($args = false, $return_type = 'ClassyPost') {
310 310
 
311
-		$posts = self::get_posts( $args, $return_type );
311
+		$posts = self::get_posts($args, $return_type);
312 312
 
313
-		if ( $post = reset( $posts ) ) {
313
+		if ($post = reset($posts)) {
314 314
 			return $post;
315 315
 		}
316 316
 
@@ -320,62 +320,62 @@  discard block
 block discarded – undo
320 320
 	 * @param array   $prefs
321 321
 	 * @return array mixed
322 322
 	 */
323
-	public static function get_pagination( $prefs = array() ) {
323
+	public static function get_pagination($prefs = array()) {
324 324
 
325 325
 		global $wp_query;
326 326
 		global $paged;
327 327
 		global $wp_rewrite;
328 328
 
329 329
 		$args = array();
330
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
330
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
331 331
 
332
-		if ( $wp_rewrite->using_permalinks() ) {
332
+		if ($wp_rewrite->using_permalinks()) {
333 333
 
334
-			$url = explode( '?', get_pagenum_link( 0 ) );
334
+			$url = explode('?', get_pagenum_link(0));
335 335
 
336
-			if ( isset( $url[1] ) ) {
337
-				parse_str( $url[1], $query );
336
+			if (isset($url[1])) {
337
+				parse_str($url[1], $query);
338 338
 				$args['add_args'] = $query;
339 339
 			}
340 340
 
341 341
 			$args['format'] = 'page/%#%';
342
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
342
+			$args['base'] = trailingslashit($url[0]).'%_%';
343 343
 
344 344
 		} else {
345 345
 			$big = 999999999;
346
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
346
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
347 347
 		}
348 348
 
349 349
 		$args['type'] = 'array';
350
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
351
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
350
+		$args['current'] = max(1, get_query_var('paged'));
351
+		$args['mid_size'] = max(9 - $args['current'], 3);
352 352
 		$args['prev_next'] = false;
353 353
 
354
-		if ( is_int( $prefs ) ) {
354
+		if (is_int($prefs)) {
355 355
 			$args['mid_size'] = $prefs - 2;
356 356
 		} else {
357
-			$args = array_merge( $args, $prefs );
357
+			$args = array_merge($args, $prefs);
358 358
 		}
359 359
 
360 360
 		$data = array();
361
-		$data['pages'] = ClassyHelper::paginate_links( $args );
362
-		$next = get_next_posts_page_link( $args['total'] );
361
+		$data['pages'] = ClassyHelper::paginate_links($args);
362
+		$next = get_next_posts_page_link($args['total']);
363 363
 
364
-		if ( $next ) {
365
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
364
+		if ($next) {
365
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
366 366
 		}
367 367
 
368
-		$prev = previous_posts( false );
368
+		$prev = previous_posts(false);
369 369
 
370
-		if ( $prev ) {
371
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
370
+		if ($prev) {
371
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
372 372
 		}
373 373
 
374
-		if ( $paged < 2 ) {
374
+		if ($paged < 2) {
375 375
 			$data['prev'] = null;
376 376
 		}
377 377
 
378
-		return ClassyHelper::array_to_object( $data );
378
+		return ClassyHelper::array_to_object($data);
379 379
 
380 380
 	}
381 381
 }
Please login to merge, or discard this 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[] = $post->id;
285 287
 
286
-				} elseif ( 'object' == $return ) {
288
+				}
289
+				elseif ( 'object' == $return ) {
287 290
 
288 291
 					$_return[] = $post;
289 292
 
290
-				} elseif ( class_exists( $return ) ) {
293
+				}
294
+				elseif ( class_exists( $return ) ) {
291 295
 
292 296
 					$_return[] = new $return( $post );
293 297
 
@@ -341,7 +345,8 @@  discard block
 block discarded – undo
341 345
 			$args['format'] = 'page/%#%';
342 346
 			$args['base'] = trailingslashit( $url[0] ).'%_%';
343 347
 
344
-		} else {
348
+		}
349
+		else {
345 350
 			$big = 999999999;
346 351
 			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
347 352
 		}
@@ -353,7 +358,8 @@  discard block
 block discarded – undo
353 358
 
354 359
 		if ( is_int( $prefs ) ) {
355 360
 			$args['mid_size'] = $prefs - 2;
356
-		} else {
361
+		}
362
+		else {
357 363
 			$args = array_merge( $args, $prefs );
358 364
 		}
359 365
 
Please login to merge, or discard this patch.
app/models/classy-user.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -61,6 +61,9 @@
 block discarded – undo
61 61
 		$this->init();
62 62
 	}
63 63
 
64
+	/**
65
+	 * @param integer|null $uid
66
+	 */
64 67
 	private function verify_id($uid) {
65 68
 		return $uid;
66 69
 	}
Please login to merge, or discard this 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.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
60 60
 	 * Main constructor function. Requires user id
61 61
 	 * @param int $uid
62 62
 	 */
63
-	public function __construct( $uid = null ) {
64
-		$this->ID = $this->verify_id( $uid );
63
+	public function __construct($uid = null) {
64
+		$this->ID = $this->verify_id($uid);
65 65
 
66 66
 		$this->init();
67 67
 	}
68 68
 
69
-	private function verify_id( $uid ) {
69
+	private function verify_id($uid) {
70 70
 		return $uid;
71 71
 	}
72 72
 
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 	private function init() {
77 77
 		$object = (array) $this->get_object();
78 78
 
79
-		$this->import( $object );
79
+		$this->import($object);
80 80
 
81
-		if ( isset( $this->first_name ) && isset( $this->last_name ) ) {
82
-			$this->name = $this->first_name . ' ' . $this->last_name;
81
+		if (isset($this->first_name) && isset($this->last_name)) {
82
+			$this->name = $this->first_name.' '.$this->last_name;
83 83
 		} else {
84 84
 			$this->name = 'Anonymous';
85 85
 		}
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return object
93 93
 	 */
94 94
 	private function get_object() {
95
-		return get_userdata( $this->ID );
95
+		return get_userdata($this->ID);
96 96
 	}
97 97
 
98 98
 	/**
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 	 * @return string
157 157
 	 */
158 158
 	public function link() {
159
-		if ( ! $this->link ) {
160
-			$this->link = get_author_posts_url( $this->ID );
159
+		if (!$this->link) {
160
+			$this->link = get_author_posts_url($this->ID);
161 161
 		}
162 162
 
163 163
 		return $this->link;
Please login to merge, or discard this patch.
app/appearance.php 2 patches
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.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -9,13 +9,13 @@  discard block
 block discarded – undo
9 9
 
10 10
 	public function __construct() {
11 11
 
12
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
12
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_styles'));
13 13
 
14
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
14
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
15 15
 
16
-		add_action( 'wp_print_scripts', array( $this, 'init_js_vars' ) );
16
+		add_action('wp_print_scripts', array($this, 'init_js_vars'));
17 17
 
18
-		add_action( 'after_setup_theme', array( $this, 'setup_theme' ) );
18
+		add_action('after_setup_theme', array($this, 'setup_theme'));
19 19
 
20 20
 	}
21 21
 
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	 */
25 25
 	public function enqueue_styles() {
26 26
 
27
-		wp_register_style( 'general_css', THEME_DIR . 'assets/css/general.css', array(), THEME_VERSION, 'all' );
27
+		wp_register_style('general_css', THEME_DIR.'assets/css/general.css', array(), THEME_VERSION, 'all');
28 28
 
29 29
 		// wp_enqueue_style( 'general_css' );
30 30
 
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function enqueue_scripts() {
37 37
 
38
-		if ( Classy::get_config_var( 'environment' ) == 'production' ) {
38
+		if (Classy::get_config_var('environment') == 'production') {
39 39
 
40
-			wp_register_script( 'theme_scripts', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
40
+			wp_register_script('theme_scripts', THEME_DIR.'assets/js/min/production.js', array('jquery'), THEME_VERSION, true);
41 41
 
42 42
 		} else {
43 43
 
44
-			wp_register_script( 'theme_scripts', THEME_DIR . 'assets/js/scripts.js', array( 'jquery' ), THEME_VERSION, true );
44
+			wp_register_script('theme_scripts', THEME_DIR.'assets/js/scripts.js', array('jquery'), THEME_VERSION, true);
45 45
 
46 46
 		}
47 47
 
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 	public function init_js_vars() {
56 56
 
57 57
 		$options = array(
58
-			'base_url'          => home_url( '' ),
59
-			'blog_url'          => home_url( 'archives/' ),
58
+			'base_url'          => home_url(''),
59
+			'blog_url'          => home_url('archives/'),
60 60
 			'template_dir'      => THEME_DIR,
61
-			'ajax_load_url'     => admin_url( 'admin-ajax.php' ),
61
+			'ajax_load_url'     => admin_url('admin-ajax.php'),
62 62
 			'is_mobile'         => (int) wp_is_mobile(),
63 63
 		);
64 64
 
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
86 86
 		 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
87 87
 		 */
88 88
 
89
-		add_theme_support( 'post-thumbnails' );
89
+		add_theme_support('post-thumbnails');
90 90
 
91 91
 		// This theme uses wp_nav_menu() in one location.
92 92
 		register_nav_menus(array(
93
-			'header-menu' => __( 'Header Menu', Classy::textdomain() ),
94
-			'footer-menu' => __( 'Footer Menu', Classy::textdomain() ),
93
+			'header-menu' => __('Header Menu', Classy::textdomain()),
94
+			'footer-menu' => __('Footer Menu', Classy::textdomain()),
95 95
 		));
96 96
 
97 97
 		/*
Please login to merge, or discard this patch.
app/classy/classy-comment.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
 	/**
63 63
 	 * Returns ClassyUser object of comment author
64 64
 	 * 
65
-	 * @return object ClassyUser
65
+	 * @return ClassyUser ClassyUser
66 66
 	 */
67 67
 	public function author() {
68 68
 		
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 	 *
50 50
 	 * @param WP_Comment $item
51 51
 	 */
52
-	public function __construct( $item ) {
52
+	public function __construct($item) {
53 53
 
54
-		if ( is_a( $item, 'WP_Comment' ) ) {
54
+		if (is_a($item, 'WP_Comment')) {
55 55
 
56
-			$this->import( $item );
56
+			$this->import($item);
57 57
 
58 58
 		}
59 59
 
@@ -66,15 +66,15 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public function author() {
68 68
 
69
-		if ( $this->user_id ) {
69
+		if ($this->user_id) {
70 70
 
71
-			return new ClassyUser( $this->user_id );
71
+			return new ClassyUser($this->user_id);
72 72
 
73 73
 		} else {
74 74
 
75
-			$author = new ClassyUser( 0 );
75
+			$author = new ClassyUser(0);
76 76
 
77
-			if ( isset( $this->comment_author ) && $this->comment_author ) {
77
+			if (isset($this->comment_author) && $this->comment_author) {
78 78
 
79 79
 				$author->name = $this->comment_author;
80 80
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return string
92 92
 	 */
93 93
 	public function content() {
94
-		return apply_filters( 'get_comment_text ', $this->comment_content );
94
+		return apply_filters('get_comment_text ', $this->comment_content);
95 95
 	}
96 96
 
97 97
 	/**
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
 	 * @param  string $date_format
110 110
 	 * @return string
111 111
 	 */
112
-	public function date( $date_format = '' ) {
113
-		$df = $date_format ? $date_format : get_option( 'date_format' );
114
-		$the_date = (string) mysql2date( $df, $this->comment_date );
112
+	public function date($date_format = '') {
113
+		$df = $date_format ? $date_format : get_option('date_format');
114
+		$the_date = (string) mysql2date($df, $this->comment_date);
115 115
 
116
-		return apply_filters( 'get_comment_date ', $the_date, $df );
116
+		return apply_filters('get_comment_date ', $the_date, $df);
117 117
 	}
118 118
 
119 119
 	/**
@@ -132,26 +132,26 @@  discard block
 block discarded – undo
132 132
 	 * @param  string $default
133 133
 	 * @return string
134 134
 	 */
135
-	public function avatar( $size = 92, $default = '' ) {
135
+	public function avatar($size = 92, $default = '') {
136 136
 
137
-		if ( ! get_option( 'show_avatars' ) ) {
137
+		if (!get_option('show_avatars')) {
138 138
 			return false;
139 139
 		}
140 140
 
141
-		if ( ! is_numeric( $size ) ) { $size = '92'; }
141
+		if (!is_numeric($size)) { $size = '92'; }
142 142
 
143 143
 		$email = $this->get_avatar_email();
144 144
 		$email_hash = '';
145 145
 
146
-		if ( ! empty( $email ) ) {
147
-			$email_hash = md5( strtolower( trim( $email ) ) );
146
+		if (!empty($email)) {
147
+			$email_hash = md5(strtolower(trim($email)));
148 148
 		}
149 149
 
150
-		$host = $this->get_avatar_host( $email_hash );
151
-		$default = $this->get_default_avatar( $default, $email, $size, $host );
150
+		$host = $this->get_avatar_host($email_hash);
151
+		$default = $this->get_default_avatar($default, $email, $size, $host);
152 152
 
153
-		if ( ! empty( $email ) ) {
154
-			$avatar = $this->get_avatar_url( $default, $host, $email_hash, $size );
153
+		if (!empty($email)) {
154
+			$avatar = $this->get_avatar_url($default, $host, $email_hash, $size);
155 155
 		} else {
156 156
 			$avatar = $default;
157 157
 		}
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
 	protected function get_avatar_email() {
169 169
 
170 170
 		$id = (int) $this->user_id;
171
-		$user = get_userdata( $id );
171
+		$user = get_userdata($id);
172 172
 
173
-		if ( $user ) {
173
+		if ($user) {
174 174
 			$email = $user->user_email;
175 175
 		} else {
176 176
 			$email = $this->comment_author_email;
@@ -189,32 +189,32 @@  discard block
 block discarded – undo
189 189
 	 * @param  string $host
190 190
 	 * @return string
191 191
 	 */
192
-	protected function get_default_avatar( $default, $email, $size, $host ) {
192
+	protected function get_default_avatar($default, $email, $size, $host) {
193 193
 
194
-		if ( substr( $default, 0, 1 ) == '/' ) {
195
-			$default = home_url() . $default;
194
+		if (substr($default, 0, 1) == '/') {
195
+			$default = home_url().$default;
196 196
 		}
197 197
 
198
-		if ( empty( $default ) ) {
199
-			$avatar_default = get_option( 'avatar_default' );
200
-			if ( empty( $avatar_default ) ) {
198
+		if (empty($default)) {
199
+			$avatar_default = get_option('avatar_default');
200
+			if (empty($avatar_default)) {
201 201
 				$default = 'mystery';
202 202
 			} else {
203 203
 				$default = $avatar_default;
204 204
 			}
205 205
 		}
206 206
 
207
-		if ( 'mystery' == $default ) {
208
-			$default = $host . '/avatar/ad516503a11cd5ca435acc9bb6523536?s=' . $size;
207
+		if ('mystery' == $default) {
208
+			$default = $host.'/avatar/ad516503a11cd5ca435acc9bb6523536?s='.$size;
209 209
 			// ad516503a11cd5ca435acc9bb6523536 == md5('[email protected]')
210
-		} else if ( 'blank' == $default ) {
211
-			$default = $email ? 'blank' : includes_url( 'images/blank.gif' );
212
-		} else if ( ! empty( $email ) && 'gravatar_default' == $default ) {
210
+		} else if ('blank' == $default) {
211
+			$default = $email ? 'blank' : includes_url('images/blank.gif');
212
+		} else if (!empty($email) && 'gravatar_default' == $default) {
213 213
 			$default = '';
214
-		} else if ( 'gravatar_default' == $default ) {
215
-			$default = $host . '/avatar/?s=' . $size;
216
-		} else if ( empty( $email ) && ! strstr( $default, 'http://' ) ) {
217
-			$default = $host . '/avatar/?d=' . $default . '&amp;s=' . $size;
214
+		} else if ('gravatar_default' == $default) {
215
+			$default = $host.'/avatar/?s='.$size;
216
+		} else if (empty($email) && !strstr($default, 'http://')) {
217
+			$default = $host.'/avatar/?d='.$default.'&amp;s='.$size;
218 218
 		}
219 219
 
220 220
 		return $default;
@@ -227,13 +227,13 @@  discard block
 block discarded – undo
227 227
 	 * @param  string $email_hash
228 228
 	 * @return string
229 229
 	 */
230
-	protected function get_avatar_host( $email_hash ) {
230
+	protected function get_avatar_host($email_hash) {
231 231
 
232
-		if ( is_ssl() ) {
232
+		if (is_ssl()) {
233 233
 			$host = 'https://secure.gravatar.com';
234 234
 		} else {
235
-			if ( ! empty( $email_hash ) ) {
236
-				$host = sprintf( 'http://%d.gravatar.com', (hexdec( $email_hash[0] ) % 2) );
235
+			if (!empty($email_hash)) {
236
+				$host = sprintf('http://%d.gravatar.com', (hexdec($email_hash[0]) % 2));
237 237
 			} else {
238 238
 				$host = 'http://0.gravatar.com';
239 239
 			}
@@ -252,16 +252,16 @@  discard block
 block discarded – undo
252 252
 	 * @param  int $size
253 253
 	 * @return string
254 254
 	 */
255
-	protected function get_avatar_url( $default, $host, $email_hash, $size ) {
255
+	protected function get_avatar_url($default, $host, $email_hash, $size) {
256 256
 
257
-		$_return = $host . '/avatar/' . $email_hash . '?s=' . $size . '&amp;d=' . urlencode( $default );
258
-		$rating = get_option( 'avatar_rating' );
257
+		$_return = $host.'/avatar/'.$email_hash.'?s='.$size.'&amp;d='.urlencode($default);
258
+		$rating = get_option('avatar_rating');
259 259
 
260
-		if ( ! empty( $rating ) ) {
261
-			$_return .= '&amp;r=' . $rating;
260
+		if (!empty($rating)) {
261
+			$_return .= '&amp;r='.$rating;
262 262
 		}
263 263
 
264
-		return str_replace( '&#038;', '&amp;', esc_url( $_return ) );
264
+		return str_replace('&#038;', '&amp;', esc_url($_return));
265 265
 
266 266
 	}
267 267
 
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @param ClassyComment $comment
272 272
 	 */
273
-	public function add_child( $comment ) {
273
+	public function add_child($comment) {
274 274
 
275 275
 		$this->children[] = $item;
276 276
 		$item->level = $this->level + 1;
277 277
 
278
-		if ( $item->children ) {
278
+		if ($item->children) {
279 279
 			$this->update_child_levels();
280 280
 		}
281 281
 
@@ -289,9 +289,9 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	protected function update_child_levels() {
291 291
 
292
-		if ( is_array( $this->children ) ) {
292
+		if (is_array($this->children)) {
293 293
 
294
-			foreach ( $this->children as $child ) {
294
+			foreach ($this->children as $child) {
295 295
 				$child->level = $this->level + 1;
296 296
 				$child->update_child_levels();
297 297
 			}
Please login to merge, or discard this 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.
app/classy/classy-scope.php 3 patches
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.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -43,6 +43,7 @@
 block discarded – undo
43 43
 	/**
44 44
 	 * Extends Scope with scope that is defined in theme_name/scope folder
45 45
 	 * 
46
+	 * @param string|false $view_name
46 47
 	 * @return array
47 48
 	 */
48 49
 	public static function extend_scope($scope, $view_name) {
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,21 +16,21 @@  discard block
 block discarded – undo
16 16
 	 *
17 17
 	 * @return array
18 18
 	 */
19
-	public static function get_scope( $view_name = null ) {
19
+	public static function get_scope($view_name = null) {
20 20
 
21 21
 		$scope = self::get_common_scope();
22 22
 
23
-		if ( is_string( $view_name ) ) {
23
+		if (is_string($view_name)) {
24 24
 
25
-			$scope = self::extend_scope( $scope, $view_name );
25
+			$scope = self::extend_scope($scope, $view_name);
26 26
 
27 27
 		} else {
28 28
 
29 29
 			$request = ClassyHierarchy::get_current_request();
30 30
 
31
-			$file = ClassyHierarchy::get_available_file( 'scope', $request );
31
+			$file = ClassyHierarchy::get_available_file('scope', $request);
32 32
 
33
-			$scope = self::extend_scope( $scope, $file );
33
+			$scope = self::extend_scope($scope, $file);
34 34
 
35 35
 		}
36 36
 
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 	 *
45 45
 	 * @return array
46 46
 	 */
47
-	public static function extend_scope( $scope, $view_name ) {
47
+	public static function extend_scope($scope, $view_name) {
48 48
 
49
-		$scope = array_merge( $scope, self::require_scope( $view_name ) );
49
+		$scope = array_merge($scope, self::require_scope($view_name));
50 50
 
51 51
 		return $scope;
52 52
 
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 	 */
61 61
 	public static function get_common_scope() {
62 62
 
63
-		if ( null === self::$common ) {
63
+		if (null === self::$common) {
64 64
 
65
-			self::$common = self::require_scope( 'common' );
65
+			self::$common = self::require_scope('common');
66 66
 
67 67
 		}
68 68
 
@@ -76,19 +76,19 @@  discard block
 block discarded – undo
76 76
 	 * @param  string $filename
77 77
 	 * @return array
78 78
 	 */
79
-	public static function require_scope( $filename ) {
79
+	public static function require_scope($filename) {
80 80
 
81 81
 		$_return = array();
82 82
 
83
-		$file = ClassyHierarchy::get_file_path( 'scope', $filename );
83
+		$file = ClassyHierarchy::get_file_path('scope', $filename);
84 84
 
85
-		if ( file_exists( $file ) ) {
85
+		if (file_exists($file)) {
86 86
 
87 87
 			require $file;
88 88
 
89 89
 		}
90 90
 
91
-		if ( isset( $data ) ) {
91
+		if (isset($data)) {
92 92
 
93 93
 			$_return = $data;
94 94
 
Please login to merge, or discard this patch.
footer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php Classy::render( 'layout.footer' ); ?>
2 1
\ No newline at end of file
2
+<?php Classy::render('layout.footer'); ?>
3 3
\ No newline at end of file
Please login to merge, or discard this patch.
app/models/classy-post.php 3 patches
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.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@
 block discarded – undo
186 186
 	/**
187 187
 	 * Returns first attached image id
188 188
 	 *
189
-	 * @return int|boolean
189
+	 * @return integer|null
190 190
 	 */
191 191
 	public function get_first_attached_image_id() {
192 192
 
Please login to merge, or discard this patch.
Spacing   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
 	 * Main constructor function. If ID won't be provided we will try to find it, based on your query
74 74
 	 * @param object/int $post
75 75
 	 */
76
-	public function __construct( $post = null ) {
77
-		if ( is_integer( $post ) ) {
76
+	public function __construct($post = null) {
77
+		if (is_integer($post)) {
78 78
 			$this->ID = $post;
79 79
 			$this->init();
80
-		} elseif ( is_a( $post, 'WP_Post' ) ) {
81
-			$this->import( $post );
80
+		} elseif (is_a($post, 'WP_Post')) {
81
+			$this->import($post);
82 82
 		}
83 83
 	}
84 84
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	protected function init() {
89 89
 		$post = $this->get_object();
90 90
 
91
-		if ( is_a( $post, 'WP_Post' ) ) {
92
-			$this->import( $post );
91
+		if (is_a($post, 'WP_Post')) {
92
+			$this->import($post);
93 93
 		}
94 94
 	}
95 95
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	 */
101 101
 
102 102
 	public function get_object() {
103
-		$object = get_post( $this->ID );
103
+		$object = get_post($this->ID);
104 104
 
105 105
 		return $object;
106 106
 	}
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
 	 * @return boolean
112 112
 	 */
113 113
 	public function can_edit() {
114
-		if ( ! function_exists( 'current_user_can' ) ) {
114
+		if (!function_exists('current_user_can')) {
115 115
 			return false;
116 116
 		}
117
-		if ( current_user_can( 'edit_post', $this->ID ) ) {
117
+		if (current_user_can('edit_post', $this->ID)) {
118 118
 			return true;
119 119
 		}
120 120
 		return false;
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 	 * @return string
127 127
 	 */
128 128
 	public function get_edit_url() {
129
-		if ( $this->can_edit() ) {
130
-			return get_edit_post_link( $this->ID );
129
+		if ($this->can_edit()) {
130
+			return get_edit_post_link($this->ID);
131 131
 		}
132 132
 	}
133 133
 
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 			'fields' => 'ids',
150 150
 		);
151 151
 
152
-		$images = get_children( $attrs );
152
+		$images = get_children($attrs);
153 153
 
154
-		if ( ! count( $images ) ) {
154
+		if (!count($images)) {
155 155
 			return false;
156 156
 		}
157 157
 
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$images = $this->get_attached_images();
172 172
 
173
-		if ( $images ) {
173
+		if ($images) {
174 174
 
175
-			foreach ( $images as $image_id ) {
175
+			foreach ($images as $image_id) {
176 176
 
177
-				$_return[] = new ClassyImage( $image_id );
177
+				$_return[] = new ClassyImage($image_id);
178 178
 
179 179
 			}
180 180
 		}
@@ -201,13 +201,13 @@  discard block
 block discarded – undo
201 201
 			'fields' => 'ids',
202 202
 		);
203 203
 
204
-		$images = get_children( $attrs );
204
+		$images = get_children($attrs);
205 205
 
206
-		if ( ! count( $images ) ) {
206
+		if (!count($images)) {
207 207
 			return false;
208 208
 		}
209 209
 
210
-		$images = array_values( $images );
210
+		$images = array_values($images);
211 211
 
212 212
 		return $images[0];
213 213
 
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 
224 224
 		$image_id = $this->get_first_attached_image_id();
225 225
 
226
-		if ( $image_id ) {
227
-			return new ClassyImage( $image_id );
226
+		if ($image_id) {
227
+			return new ClassyImage($image_id);
228 228
 		}
229 229
 
230 230
 		return new ClassyImage();
@@ -238,12 +238,12 @@  discard block
 block discarded – undo
238 238
 	 */
239 239
 	public function thumbnail() {
240 240
 
241
-		if ( function_exists( 'get_post_thumbnail_id' ) ) {
242
-			$image_id = get_post_thumbnail_id( $this->ID );
241
+		if (function_exists('get_post_thumbnail_id')) {
242
+			$image_id = get_post_thumbnail_id($this->ID);
243 243
 
244
-			if ( $image_id ) {
244
+			if ($image_id) {
245 245
 
246
-				return new ClassyImage( $image_id );
246
+				return new ClassyImage($image_id);
247 247
 
248 248
 			}
249 249
 		}
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 	 * @return string
260 260
 	 */
261 261
 	public function get_title() {
262
-		return apply_filters( 'the_title', $this->post_title, $this->ID );
262
+		return apply_filters('the_title', $this->post_title, $this->ID);
263 263
 	}
264 264
 
265 265
 	/**
@@ -278,24 +278,24 @@  discard block
 block discarded – undo
278 278
 	 * @param  integer $page Page number, in case our post has <!--nextpage--> tags
279 279
 	 * @return string        Post content
280 280
 	 */
281
-	public function get_content( $page = 0 ) {
282
-		if ( 0 == $page && $this->post_content ) {
281
+	public function get_content($page = 0) {
282
+		if (0 == $page && $this->post_content) {
283 283
 			return $this->post_content;
284 284
 		}
285 285
 
286 286
 		$content = $this->post_content;
287 287
 
288
-		if ( $page ) {
289
-			$contents = explode( '<!--nextpage-->', $content );
288
+		if ($page) {
289
+			$contents = explode('<!--nextpage-->', $content);
290 290
 
291 291
 			$page--;
292 292
 
293
-			if ( count( $contents ) > $page ) {
294
-				$content = $contents[ $page ];
293
+			if (count($contents) > $page) {
294
+				$content = $contents[$page];
295 295
 			}
296 296
 		}
297 297
 
298
-		$content = apply_filters( 'the_content', ($content) );
298
+		$content = apply_filters('the_content', ($content));
299 299
 
300 300
 		return $content;
301 301
 	}
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 * @return object
317 317
 	 */
318 318
 	public function get_post_type() {
319
-		return get_post_type_object( $this->post_type );
319
+		return get_post_type_object($this->post_type);
320 320
 	}
321 321
 
322 322
 	/**
@@ -325,11 +325,11 @@  discard block
 block discarded – undo
325 325
 	 * @return string
326 326
 	 */
327 327
 	public function get_permalink() {
328
-		if ( isset( $this->permalink ) ) {
328
+		if (isset($this->permalink)) {
329 329
 			return $this->permalink;
330 330
 		}
331 331
 
332
-		$this->permalink = get_permalink( $this->ID );
332
+		$this->permalink = get_permalink($this->ID);
333 333
 
334 334
 		return $this->permalink;
335 335
 	}
@@ -355,91 +355,91 @@  discard block
 block discarded – undo
355 355
 	 * @param  boolean $strip    Should we strip tags?
356 356
 	 * @return string            Post preview
357 357
 	 */
358
-	public function get_preview( $len = 50, $force = false, $readmore = 'Read More', $strip = true ) {
358
+	public function get_preview($len = 50, $force = false, $readmore = 'Read More', $strip = true) {
359 359
 		$text = '';
360 360
 		$trimmed = false;
361 361
 
362
-		if ( isset( $this->post_excerpt ) && strlen( $this->post_excerpt ) ) {
362
+		if (isset($this->post_excerpt) && strlen($this->post_excerpt)) {
363 363
 
364
-			if ( $force ) {
365
-				$text = ClassyHelper::trim_words( $this->post_excerpt, $len, false );
364
+			if ($force) {
365
+				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
366 366
 				$trimmed = true;
367 367
 			} else {
368 368
 				$text = $this->post_excerpt;
369 369
 			}
370 370
 		}
371 371
 
372
-		if ( ! strlen( $text ) && preg_match( '/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches ) ) {
372
+		if (!strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches)) {
373 373
 
374
-			$pieces = explode( $readmore_matches[0], $this->post_content );
374
+			$pieces = explode($readmore_matches[0], $this->post_content);
375 375
 			$text = $pieces[0];
376 376
 
377
-			if ( $force ) {
378
-				$text = ClassyHelper::trim_words( $text, $len, false );
377
+			if ($force) {
378
+				$text = ClassyHelper::trim_words($text, $len, false);
379 379
 				$trimmed = true;
380 380
 			}
381 381
 
382
-			$text = do_shortcode( $text );
382
+			$text = do_shortcode($text);
383 383
 
384 384
 		}
385 385
 
386
-		if ( ! strlen( $text ) ) {
386
+		if (!strlen($text)) {
387 387
 
388
-			$text = ClassyHelper::trim_words( $this->get_content(), $len, false );
388
+			$text = ClassyHelper::trim_words($this->get_content(), $len, false);
389 389
 			$trimmed = true;
390 390
 
391 391
 		}
392 392
 
393
-		if ( ! strlen( trim( $text ) ) ) {
393
+		if (!strlen(trim($text))) {
394 394
 
395
-			return trim( $text );
395
+			return trim($text);
396 396
 
397 397
 		}
398 398
 
399
-		if ( $strip ) {
399
+		if ($strip) {
400 400
 
401
-			$text = trim( strip_tags( $text ) );
401
+			$text = trim(strip_tags($text));
402 402
 
403 403
 		}
404 404
 
405
-		if ( strlen( $text ) ) {
405
+		if (strlen($text)) {
406 406
 
407
-			$text = trim( $text );
408
-			$last = $text[ strlen( $text ) - 1 ];
407
+			$text = trim($text);
408
+			$last = $text[strlen($text) - 1];
409 409
 
410
-			if ( '.' != $last && $trimmed ) {
410
+			if ('.' != $last && $trimmed) {
411 411
 				$text .= ' &hellip; ';
412 412
 			}
413 413
 
414
-			if ( ! $strip ) {
415
-				$last_p_tag = strrpos( $text, '</p>' );
416
-				if ( false !== $last_p_tag ) {
417
-					$text = substr( $text, 0, $last_p_tag );
414
+			if (!$strip) {
415
+				$last_p_tag = strrpos($text, '</p>');
416
+				if (false !== $last_p_tag) {
417
+					$text = substr($text, 0, $last_p_tag);
418 418
 				}
419
-				if ( '.' != $last && $trimmed ) {
419
+				if ('.' != $last && $trimmed) {
420 420
 					$text .= ' &hellip; ';
421 421
 				}
422 422
 			}
423 423
 
424
-			if ( $readmore && isset( $readmore_matches ) && ! empty( $readmore_matches[1] ) ) {
425
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim( $readmore_matches[1] ) . '</a>';
426
-			} elseif ( $readmore ) {
427
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim( $readmore ) . '</a>';
424
+			if ($readmore && isset($readmore_matches) && !empty($readmore_matches[1])) {
425
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore_matches[1]).'</a>';
426
+			} elseif ($readmore) {
427
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore).'</a>';
428 428
 			}
429 429
 
430
-			if ( ! $strip ) {
430
+			if (!$strip) {
431 431
 				$text .= '</p>';
432 432
 			}
433 433
 		}
434 434
 
435
-		return trim( $text );
435
+		return trim($text);
436 436
 	}
437 437
 
438 438
 	/**
439 439
 	 * Returns comments array
440 440
 	 * @return array
441 441
 	 */
442
-	public function get_comments( $status = 'approve', $order = 'DESC' ) {
442
+	public function get_comments($status = 'approve', $order = 'DESC') {
443 443
 
444 444
 		$_return = array();
445 445
 
@@ -449,26 +449,26 @@  discard block
 block discarded – undo
449 449
 			'order' => $order,
450 450
 		);
451 451
 
452
-		$comments = get_comments( $args );
452
+		$comments = get_comments($args);
453 453
 
454
-		foreach ( $comments as $comment ) {
454
+		foreach ($comments as $comment) {
455 455
 
456
-			$_return[ $comment->comment_ID ] = new ClassyComment( $comment );
456
+			$_return[$comment->comment_ID] = new ClassyComment($comment);
457 457
 
458 458
 		}
459 459
 
460
-		foreach ( $_return as $key => $comment ) {
460
+		foreach ($_return as $key => $comment) {
461 461
 
462
-			if ( $comment->has_parent() ) {
462
+			if ($comment->has_parent()) {
463 463
 
464
-				$_return[ $comment->comment_parent ]->add_child( $comment );
464
+				$_return[$comment->comment_parent]->add_child($comment);
465 465
 
466
-				unset( $_return[ $key ] );
466
+				unset($_return[$key]);
467 467
 
468 468
 			}
469 469
 		}
470 470
 
471
-		return array_values( $_return );
471
+		return array_values($_return);
472 472
 
473 473
 	}
474 474
 }
Please login to merge, or discard this patch.
app/classy/classy-query-helper.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,23 +8,23 @@  discard block
 block discarded – undo
8 8
 	 * @param  array/boolean $args
9 9
 	 * @return object        WP_Query
10 10
 	 */
11
-	public static function find_query( $args = false ) {
11
+	public static function find_query($args = false) {
12 12
 
13 13
 		$default_args = array();
14 14
 
15
-		if ( ! $args ) {
15
+		if (!$args) {
16 16
 
17 17
 			return self::get_current_query();
18 18
 
19
-		} elseif ( is_array( $args ) ) {
19
+		} elseif (is_array($args)) {
20 20
 
21
-			$args = array_merge( $default_args, $args );
21
+			$args = array_merge($default_args, $args);
22 22
 
23
-			return new WP_Query( $args );
23
+			return new WP_Query($args);
24 24
 
25 25
 		} else {
26 26
 
27
-			return new WP_Query( $default_args );
27
+			return new WP_Query($default_args);
28 28
 
29 29
 		}
30 30
 	}
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 
39 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 45
 		return $query;
46 46
 
@@ -52,13 +52,13 @@  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
 		}
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-helper.php 3 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -247,57 +247,57 @@
 block discarded – undo
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
 		} else {
295 295
 
296
-	        $archives_title = 'Archives';
296
+			$archives_title = 'Archives';
297 297
 
298
-	    }
298
+		}
299 299
 
300
-	    return $archives_title;
300
+		return $archives_title;
301 301
 
302 302
 	}
303 303
 }
Please login to merge, or discard this patch.
Spacing   +90 added lines, -90 removed lines patch added patch discarded remove patch
@@ -15,44 +15,44 @@  discard block
 block discarded – undo
15 15
 	 * @param string  $allowed_tags
16 16
 	 * @return string
17 17
 	 */
18
-	public static function trim_words( $text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote' ) {
19
-		if ( null === $more ) {
20
-			$more = __( '&hellip;' );
18
+	public static function trim_words($text, $num_words = 55, $more = null, $allowed_tags = 'p a span b i br blockquote') {
19
+		if (null === $more) {
20
+			$more = __('&hellip;');
21 21
 		}
22 22
 
23 23
 		$original_text = $text;
24 24
 		$allowed_tag_string = '';
25 25
 
26
-		foreach ( explode( ' ', $allowed_tags ) as $tag ) {
27
-			$allowed_tag_string .= '<' . $tag . '>';
26
+		foreach (explode(' ', $allowed_tags) as $tag) {
27
+			$allowed_tag_string .= '<'.$tag.'>';
28 28
 		}
29 29
 
30
-		$text = strip_tags( $text, $allowed_tag_string );
30
+		$text = strip_tags($text, $allowed_tag_string);
31 31
 
32 32
 		/* translators: If your word count is based on single characters (East Asian characters),
33 33
 		enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
34 34
 
35
-		if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
36
-			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
37
-			preg_match_all( '/./u', $text, $words_array );
38
-			$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
35
+		if ('characters' == _x('words', 'word count: words or characters?') && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
36
+			$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
37
+			preg_match_all('/./u', $text, $words_array);
38
+			$words_array = array_slice($words_array[0], 0, $num_words + 1);
39 39
 			$sep = '';
40 40
 		} else {
41
-			$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
41
+			$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
42 42
 			$sep = ' ';
43 43
 		}
44 44
 
45
-		if ( count( $words_array ) > $num_words ) {
46
-			array_pop( $words_array );
47
-			$text = implode( $sep, $words_array );
48
-			$text = $text . $more;
45
+		if (count($words_array) > $num_words) {
46
+			array_pop($words_array);
47
+			$text = implode($sep, $words_array);
48
+			$text = $text.$more;
49 49
 		} else {
50
-			$text = implode( $sep, $words_array );
50
+			$text = implode($sep, $words_array);
51 51
 		}
52 52
 
53
-		$text = self::close_tags( $text );
53
+		$text = self::close_tags($text);
54 54
 
55
-		return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
55
+		return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
56 56
 	}
57 57
 
58 58
 
@@ -62,36 +62,36 @@  discard block
 block discarded – undo
62 62
 	 * @param string  $html
63 63
 	 * @return string
64 64
 	 */
65
-	public static function close_tags( $html ) {
65
+	public static function close_tags($html) {
66 66
 		//put all opened tags into an array
67
-		preg_match_all( '#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result );
67
+		preg_match_all('#<([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
68 68
 
69 69
 		$openedtags = $result[1];
70 70
 
71 71
 		//put all closed tags into an array
72
-		preg_match_all( '#</([a-z]+)>#iU', $html, $result );
72
+		preg_match_all('#</([a-z]+)>#iU', $html, $result);
73 73
 
74 74
 		$closedtags = $result[1];
75
-		$len_opened = count( $openedtags );
75
+		$len_opened = count($openedtags);
76 76
 
77 77
 		// all tags are closed
78
-		if ( count( $closedtags ) == $len_opened ) {
78
+		if (count($closedtags) == $len_opened) {
79 79
 			return $html;
80 80
 		}
81 81
 
82
-		$openedtags = array_reverse( $openedtags );
82
+		$openedtags = array_reverse($openedtags);
83 83
 
84 84
 		// close tags
85
-		for ( $i = 0; $i < $len_opened; $i++ ) {
86
-			if ( ! in_array( $openedtags[ $i ], $closedtags ) ) {
87
-				$html .= '</' . $openedtags[ $i ] . '>';
85
+		for ($i = 0; $i < $len_opened; $i++) {
86
+			if (!in_array($openedtags[$i], $closedtags)) {
87
+				$html .= '</'.$openedtags[$i].'>';
88 88
 			} else {
89
-				unset( $closedtags[ array_search( $openedtags[ $i ], $closedtags ) ] );
89
+				unset($closedtags[array_search($openedtags[$i], $closedtags)]);
90 90
 			}
91 91
 		}
92 92
 
93
-		$html = str_replace( array( '</br>', '</hr>', '</wbr>' ), '', $html );
94
-		$html = str_replace( array( '<br>', '<hr>', '<wbr>' ), array( '<br />', '<hr />', '<wbr />' ), $html );
93
+		$html = str_replace(array('</br>', '</hr>', '</wbr>'), '', $html);
94
+		$html = str_replace(array('<br>', '<hr>', '<wbr>'), array('<br />', '<hr />', '<wbr />'), $html);
95 95
 
96 96
 		return $html;
97 97
 	}
@@ -101,14 +101,14 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @param  mixed $arg
103 103
 	 */
104
-	public static function error_log( $arg ) {
105
-		if ( ! WP_DEBUG ) {
104
+	public static function error_log($arg) {
105
+		if (!WP_DEBUG) {
106 106
 			return;
107 107
 		}
108
-		if ( is_object( $arg ) || is_array( $arg ) ) {
109
-			$arg = print_r( $arg, true );
108
+		if (is_object($arg) || is_array($arg)) {
109
+			$arg = print_r($arg, true);
110 110
 		}
111
-		return error_log( $arg );
111
+		return error_log($arg);
112 112
 	}
113 113
 
114 114
 	/**
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 * @param string  $args
118 118
 	 * @return array
119 119
 	 */
120
-	public static function paginate_links( $args = '' ) {
120
+	public static function paginate_links($args = '') {
121 121
 		$defaults = array(
122 122
 			'base' => '%_%', // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
123 123
 			'format' => '?page=%#%', // ?page=%#% : %#% is replaced by the page number
@@ -125,43 +125,43 @@  discard block
 block discarded – undo
125 125
 			'current' => 0,
126 126
 			'show_all' => false,
127 127
 			'prev_next' => true,
128
-			'prev_text' => __( '&laquo; Previous' ),
129
-			'next_text' => __( 'Next &raquo;' ),
128
+			'prev_text' => __('&laquo; Previous'),
129
+			'next_text' => __('Next &raquo;'),
130 130
 			'end_size' => 1,
131 131
 			'mid_size' => 2,
132 132
 			'type' => 'array',
133 133
 			'add_args' => false, // array of query args to add
134 134
 			'add_fragment' => '',
135 135
 		);
136
-		$args = wp_parse_args( $args, $defaults );
136
+		$args = wp_parse_args($args, $defaults);
137 137
 		// Who knows what else people pass in $args
138
-		$args['total'] = intval( (int) $args['total'] );
139
-		if ( $args['total'] < 2 ) {
138
+		$args['total'] = intval((int) $args['total']);
139
+		if ($args['total'] < 2) {
140 140
 			return array();
141 141
 		}
142 142
 		$args['current'] = (int) $args['current'];
143 143
 		$args['end_size'] = 0 < (int) $args['end_size'] ? (int) $args['end_size'] : 1; // Out of bounds?  Make it the default.
144 144
 		$args['mid_size'] = 0 <= (int) $args['mid_size'] ? (int) $args['mid_size'] : 2;
145
-		$args['add_args'] = is_array( $args['add_args'] ) ? $args['add_args'] : false;
145
+		$args['add_args'] = is_array($args['add_args']) ? $args['add_args'] : false;
146 146
 		$page_links = array();
147 147
 		$dots = false;
148
-		if ( $args['prev_next'] && $args['current'] && 1 < $args['current'] ) {
149
-			$link = str_replace( '%_%', 2 == $args['current'] ? '' : $args['format'], $args['base'] );
150
-			$link = str_replace( '%#%', $args['current'] - 1, $link );
151
-			if ( $args['add_args'] ) {
152
-				$link = add_query_arg( $args['add_args'], $link );
148
+		if ($args['prev_next'] && $args['current'] && 1 < $args['current']) {
149
+			$link = str_replace('%_%', 2 == $args['current'] ? '' : $args['format'], $args['base']);
150
+			$link = str_replace('%#%', $args['current'] - 1, $link);
151
+			if ($args['add_args']) {
152
+				$link = add_query_arg($args['add_args'], $link);
153 153
 			}
154 154
 			$link .= $args['add_fragment'];
155
-			$link = untrailingslashit( $link );
155
+			$link = untrailingslashit($link);
156 156
 			$page_links[] = array(
157 157
 				'class' => 'prev page-numbers',
158
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
158
+				'link' => esc_url(apply_filters('paginate_links', $link)),
159 159
 				'title' => $args['prev_text'],
160 160
 			);
161 161
 		}
162
-		for ( $n = 1; $n <= $args['total']; $n++ ) {
163
-			$n_display = number_format_i18n( $n );
164
-			if ( $n == $args['current'] ) {
162
+		for ($n = 1; $n <= $args['total']; $n++) {
163
+			$n_display = number_format_i18n($n);
164
+			if ($n == $args['current']) {
165 165
 				$page_links[] = array(
166 166
 					'class' => 'page-number page-numbers current',
167 167
 					'title' => $n_display,
@@ -171,42 +171,42 @@  discard block
 block discarded – undo
171 171
 				);
172 172
 				$dots = true;
173 173
 			} else {
174
-				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
-					$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
176
-					$link = str_replace( '%#%', $n, $link );
177
-					$link = trailingslashit( $link ) . ltrim( $args['add_fragment'], '/' );
178
-					if ( $args['add_args'] ) {
179
-						$link = rtrim( add_query_arg( $args['add_args'], $link ), '/' );
174
+				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
+					$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
176
+					$link = str_replace('%#%', $n, $link);
177
+					$link = trailingslashit($link).ltrim($args['add_fragment'], '/');
178
+					if ($args['add_args']) {
179
+						$link = rtrim(add_query_arg($args['add_args'], $link), '/');
180 180
 					}
181
-					$link = str_replace( ' ', '+', $link );
182
-					$link = untrailingslashit( $link );
181
+					$link = str_replace(' ', '+', $link);
182
+					$link = untrailingslashit($link);
183 183
 					$page_links[] = array(
184 184
 						'class' => 'page-number page-numbers',
185
-						'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
185
+						'link' => esc_url(apply_filters('paginate_links', $link)),
186 186
 						'title' => $n_display,
187 187
 						'name' => $n_display,
188 188
 						'current' => $args['current'] == $n,
189 189
 					);
190 190
 					$dots = true;
191
-				} elseif ( $dots && ! $args['show_all'] ) {
191
+				} elseif ($dots && !$args['show_all']) {
192 192
 					$page_links[] = array(
193 193
 						'class' => 'dots',
194
-						'title' => __( '&hellip;' ),
194
+						'title' => __('&hellip;'),
195 195
 					);
196 196
 					$dots = false;
197 197
 				}
198 198
 			}
199 199
 		}
200
-		if ( $args['prev_next'] && $args['current'] && ( $args['current'] < $args['total'] || -1 == $args['total'] ) ) {
201
-			$link = str_replace( '%_%', $args['format'], $args['base'] );
202
-			$link = str_replace( '%#%', $args['current'] + 1, $link );
203
-			if ( $args['add_args'] ) {
204
-				$link = add_query_arg( $args['add_args'], $link );
200
+		if ($args['prev_next'] && $args['current'] && ($args['current'] < $args['total'] || -1 == $args['total'])) {
201
+			$link = str_replace('%_%', $args['format'], $args['base']);
202
+			$link = str_replace('%#%', $args['current'] + 1, $link);
203
+			if ($args['add_args']) {
204
+				$link = add_query_arg($args['add_args'], $link);
205 205
 			}
206
-			$link = untrailingslashit( trailingslashit( $link ) . $args['add_fragment'] );
206
+			$link = untrailingslashit(trailingslashit($link).$args['add_fragment']);
207 207
 			$page_links[] = array(
208 208
 				'class' => 'next page-numbers',
209
-				'link' => esc_url( apply_filters( 'paginate_links', $link ) ),
209
+				'link' => esc_url(apply_filters('paginate_links', $link)),
210 210
 				'title' => $args['next_text'],
211 211
 			);
212 212
 		}
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
 	 * @param  array $array
221 221
 	 * @return object
222 222
 	 */
223
-	public static function array_to_object( $array ) {
223
+	public static function array_to_object($array) {
224 224
 		$obj = new stdClass;
225 225
 
226
-		foreach ( $array as $k => $v ) {
227
-			if ( strlen( $k ) ) {
228
-				if ( is_array( $v ) ) {
229
-					$obj->{$k} = self::array_to_object( $v ); //RECURSION
226
+		foreach ($array as $k => $v) {
227
+			if (strlen($k)) {
228
+				if (is_array($v)) {
229
+					$obj->{$k} = self::array_to_object($v); //RECURSION
230 230
 				} else {
231 231
 					$obj->{$k} = $v;
232 232
 				}
@@ -249,42 +249,42 @@  discard block
 block discarded – undo
249 249
 
250 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 264
 	            the_post();
265
-	            $archives_title = 'Author: ' . get_the_author();
265
+	            $archives_title = 'Author: '.get_the_author();
266 266
 
267 267
 	        }
268 268
 
269 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 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 289
 	        } else {
290 290
 
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
 			}
@@ -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.