Completed
Push — master ( ab4944...534e9c )
by Andrew
02:30
created
app/models/classy-user.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 */
113 113
 	public function full_name() {
114 114
 
115
-		return $this->first_name . ' ' . $this->last_name;
115
+		return $this->first_name.' '.$this->last_name;
116 116
 
117 117
 	}
118 118
 	
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @return string
145 145
 	 */
146 146
 	public function link() {
147
-		if ( !$this->link ) {
147
+		if (!$this->link) {
148 148
 			$this->link = get_author_posts_url($this->ID);
149 149
 		}
150 150
 
Please login to merge, or discard this patch.
app/models/classy-post.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -110,10 +110,10 @@  discard block
 block discarded – undo
110 110
 	 * @return boolean
111 111
 	 */
112 112
     public function can_edit() {
113
-        if ( !function_exists( 'current_user_can' ) ) {
113
+        if (!function_exists('current_user_can')) {
114 114
             return false;
115 115
         }
116
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
116
+        if (current_user_can('edit_post', $this->ID)) {
117 117
             return true;
118 118
         }
119 119
         return false;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
      * @return string
126 126
      */
127 127
 	public function get_edit_url() {
128
-		if ( $this->can_edit() ) {
128
+		if ($this->can_edit()) {
129 129
 			return get_edit_post_link($this->ID);
130 130
 		}
131 131
 	}
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
 	 * @return ClassyImage
138 138
 	 */
139 139
 	public function get_thumbnail() {
140
-		if ( function_exists('get_post_thumbnail_id') ) {
140
+		if (function_exists('get_post_thumbnail_id')) {
141 141
 			$image_id = get_post_thumbnail_id($this->ID);
142 142
 			
143
-			if ( $image_id ) {
143
+			if ($image_id) {
144 144
 				return new ClassyImage($image_id);
145 145
 			}
146 146
 		}
@@ -172,19 +172,19 @@  discard block
 block discarded – undo
172 172
 	 * @param  integer $page Page number, in case our post has <!--nextpage--> tags
173 173
 	 * @return string        Post content
174 174
 	 */
175
-	public function get_content( $page = 0 ) {
176
-		if ( $page == 0 && $this->post_content ) {
175
+	public function get_content($page = 0) {
176
+		if ($page == 0 && $this->post_content) {
177 177
 			return $this->post_content;
178 178
 		}
179 179
 		
180 180
 		$content = $this->post_content;
181 181
 		
182
-		if ( $page ) {
182
+		if ($page) {
183 183
 			$contents = explode('<!--nextpage-->', $content);
184 184
 			
185 185
 			$page--;
186 186
 
187
-			if ( count($contents) > $page ) {
187
+			if (count($contents) > $page) {
188 188
 				$content = $contents[$page];
189 189
 			}
190 190
 		}
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 	 * @return string
220 220
 	 */
221 221
 	public function get_permalink() {
222
-		if ( isset($this->permalink) ) {
222
+		if (isset($this->permalink)) {
223 223
 			return $this->permalink;
224 224
 		}
225 225
 
@@ -253,9 +253,9 @@  discard block
 block discarded – undo
253 253
 		$text = '';
254 254
 		$trimmed = false;
255 255
 
256
-		if ( isset($this->post_excerpt) && strlen($this->post_excerpt) ) {
256
+		if (isset($this->post_excerpt) && strlen($this->post_excerpt)) {
257 257
 			
258
-			if ( $force ) {
258
+			if ($force) {
259 259
 				$text = ClassyHelper::trim_words($this->post_excerpt, $len, false);
260 260
 				$trimmed = true;
261 261
 			} else {
@@ -264,65 +264,65 @@  discard block
 block discarded – undo
264 264
 
265 265
 		}
266 266
 
267
-		if ( !strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches) ) {
267
+		if (!strlen($text) && preg_match('/<!--\s?more(.*?)?-->/', $this->post_content, $readmore_matches)) {
268 268
 
269 269
 			$pieces = explode($readmore_matches[0], $this->post_content);
270 270
 			$text = $pieces[0];
271 271
 
272
-			if ( $force ) {
272
+			if ($force) {
273 273
 				$text = ClassyHelper::trim_words($text, $len, false);
274 274
 				$trimmed = true;
275 275
 			}
276 276
 
277
-			$text = do_shortcode( $text );
277
+			$text = do_shortcode($text);
278 278
 
279 279
 		}
280 280
 
281
-		if ( !strlen($text) ) {
281
+		if (!strlen($text)) {
282 282
 
283 283
 			$text = ClassyHelper::trim_words($this->get_content(), $len, false);
284 284
 			$trimmed = true;
285 285
 
286 286
 		}
287 287
 
288
-		if ( !strlen(trim($text)) ) {
288
+		if (!strlen(trim($text))) {
289 289
 
290 290
 			return trim($text);
291 291
 
292 292
 		}
293 293
 
294
-		if ( $strip ) {
294
+		if ($strip) {
295 295
 
296 296
 			$text = trim(strip_tags($text));
297 297
 
298 298
 		}
299 299
 
300
-		if ( strlen($text) ) {
300
+		if (strlen($text)) {
301 301
 
302 302
 			$text = trim($text);
303 303
 			$last = $text[strlen($text) - 1];
304 304
 			
305
-			if ( $last != '.' && $trimmed ) {
305
+			if ($last != '.' && $trimmed) {
306 306
 				$text .= ' &hellip; ';
307 307
 			}
308 308
 			
309
-			if ( !$strip ) {
309
+			if (!$strip) {
310 310
 				$last_p_tag = strrpos($text, '</p>');
311
-				if ( $last_p_tag !== false ) {
311
+				if ($last_p_tag !== false) {
312 312
 					$text = substr($text, 0, $last_p_tag);
313 313
 				}
314
-				if ( $last != '.' && $trimmed ) {
314
+				if ($last != '.' && $trimmed) {
315 315
 					$text .= ' &hellip; ';
316 316
 				}
317 317
 			}
318 318
 			
319
-			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
320
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore_matches[1]) . '</a>';
321
-			} elseif ( $readmore ) {
322
-				$text .= ' <a href="' . $this->get_permalink() . '" class="read-more">' . trim($readmore) . '</a>';
319
+			if ($readmore && isset($readmore_matches) && !empty($readmore_matches[1])) {
320
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore_matches[1]).'</a>';
321
+			} elseif ($readmore) {
322
+				$text .= ' <a href="'.$this->get_permalink().'" class="read-more">'.trim($readmore).'</a>';
323 323
 			}
324 324
 			
325
-			if ( !$strip ) {
325
+			if (!$strip) {
326 326
 				$text .= '</p>';
327 327
 			}
328 328
 
Please login to merge, or discard this patch.
app/appearance.php 1 patch
Spacing   +15 added lines, -15 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,9 +24,9 @@  discard block
 block discarded – undo
24 24
 	 */
25 25
 	public function enqueue_styles() {
26 26
 
27
-		wp_register_style( 'flotheme_general_css', THEME_DIR . 'assets/css/general.css', array(), THEME_VERSION, 'all' );
27
+		wp_register_style('flotheme_general_css', THEME_DIR.'assets/css/general.css', array(), THEME_VERSION, 'all');
28 28
 		
29
-		wp_enqueue_style( 'flotheme_general_css' );
29
+		wp_enqueue_style('flotheme_general_css');
30 30
 
31 31
 	}
32 32
 
@@ -35,27 +35,27 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function enqueue_scripts() {
37 37
 
38
-		wp_deregister_script( 'jquery' );
38
+		wp_deregister_script('jquery');
39 39
 		
40
-		wp_register_script( 'jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js', array(), THEME_VERSION, true );
40
+		wp_register_script('jquery', 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js', array(), THEME_VERSION, true);
41 41
 
42
-		if ( Classy::get_config_var('environment') == 'production' ) {
42
+		if (Classy::get_config_var('environment') == 'production') {
43 43
 		
44
-			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/min/production.js', array( 'jquery' ), THEME_VERSION, true );
44
+			wp_register_script('theme_plugins', THEME_DIR.'assets/js/min/production.js', array('jquery'), THEME_VERSION, true);
45 45
 		
46 46
 		} else {
47 47
 			
48
-			wp_register_script( 'theme_plugins', THEME_DIR . 'assets/js/plugins.js', array( 'jquery' ), THEME_VERSION, true );
48
+			wp_register_script('theme_plugins', THEME_DIR.'assets/js/plugins.js', array('jquery'), THEME_VERSION, true);
49 49
 
50
-			wp_register_script( 'theme_scripts', THEME_DIR . 'assets/js/scripts.js', array( 'jquery' ), THEME_VERSION, true );
50
+			wp_register_script('theme_scripts', THEME_DIR.'assets/js/scripts.js', array('jquery'), THEME_VERSION, true);
51 51
 		
52 52
 		}
53 53
 
54
-		wp_enqueue_script( 'theme_plugins' );
54
+		wp_enqueue_script('theme_plugins');
55 55
 		
56
-		wp_enqueue_script( 'theme_scripts' );
56
+		wp_enqueue_script('theme_scripts');
57 57
 
58
-		wp_enqueue_script( 'theme_production' );
58
+		wp_enqueue_script('theme_production');
59 59
 
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
app/classy/classy-query-helper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  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 43
         $query = self::handle_maybe_custom_posts_page($query);
44 44
 
@@ -52,11 +52,11 @@  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 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 61
         		return new WP_Query(array('post_type' => 'post'));
62 62
         
Please login to merge, or discard this patch.
app/classy/classy-menu-item.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -124,12 +124,12 @@  discard block
 block discarded – undo
124 124
 	 */
125 125
 	public function add_child($item) {
126 126
 
127
-		if ( !$this->has_child ) {
128
-			$this->add_class( 'menu-item-has-children' );
127
+		if (!$this->has_child) {
128
+			$this->add_class('menu-item-has-children');
129 129
 			$this->has_child = true;
130 130
 		}
131 131
 
132
-		if ( !isset( $this->children ) ) {
132
+		if (!isset($this->children)) {
133 133
 			$this->children = array();
134 134
 		}
135 135
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 */
150 150
 	protected function filter_classes() {
151 151
 
152
-		$this->classes = apply_filters( 'nav_menu_css_class', $this->classes, $this );
152
+		$this->classes = apply_filters('nav_menu_css_class', $this->classes, $this);
153 153
 	
154 154
 	}
155 155
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 
163 163
 		if (is_array($this->children)) {
164 164
 		
165
-			foreach( $this->children as $child ) {
165
+			foreach ($this->children as $child) {
166 166
 				$child->level = $this->level + 1;
167 167
 				$child->update_child_levels();
168 168
 			}
Please login to merge, or discard this patch.
app/classy/classy-basis.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,21 +14,21 @@
 block discarded – undo
14 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 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 33
                     $this->$key = $value;
34 34
             
Please login to merge, or discard this patch.
app/classy/classy-scope.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public static function get_common_scope() {
55 55
 		
56
-		if ( null === self::$common ) {
56
+		if (null === self::$common) {
57 57
 
58 58
 			self::$common = self::require_scope('common');
59 59
 
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
 
74 74
 		$return = array();
75 75
 
76
-		$file = THEME_PATH . 'scope/' . $filename . '.php';
76
+		$file = THEME_PATH.'scope/'.$filename.'.php';
77 77
 
78
-		if ( file_exists($file) ) {
78
+		if (file_exists($file)) {
79 79
 
80 80
 			require $file;
81 81
 			
82 82
 		}
83 83
 
84
-		if ( isset($data) ) {
84
+		if (isset($data)) {
85 85
 			
86 86
 			$return = $data;
87 87
 
Please login to merge, or discard this patch.
app/classy/classy.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @return Classy A single instance of this class.
26 26
 	 */
27 27
 	public static function get_instance() {
28
-		if ( null === self::$single_instance ) {
28
+		if (null === self::$single_instance) {
29 29
 			self::$single_instance = new self();
30 30
 		}
31 31
 
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 	 * @param  string
56 56
 	 * @param  string
57 57
 	 */
58
-	private function define( $name, $value ) {
59
-		if ( !defined($name) ) {
58
+	private function define($name, $value) {
59
+		if (!defined($name)) {
60 60
 			
61
-			define( $name, $value );
61
+			define($name, $value);
62 62
 
63 63
 		}
64 64
 	}
@@ -72,56 +72,56 @@  discard block
 block discarded – undo
72 72
 	private function define_constants() {
73 73
 		$theme = wp_get_theme();
74 74
 
75
-		$this->define( 'THEME', $theme->template );
76
-		$this->define( 'THEME_NAME', $theme->get('Name') );
77
-		$this->define( 'THEME_PATH', get_template_directory() . '/' );
78
-		$this->define( 'THEME_DIR', get_template_directory_uri() . '/' );
79
-		$this->define( 'THEME_VERSION', $theme->get('Version') );
80
-		$this->define( 'THEME_FRAMEWORK_PATH', THEME_PATH . 'app/' );
81
-		$this->define( 'THEME_FRAMEWORK_DIR', THEME_DIR . 'app/' );
75
+		$this->define('THEME', $theme->template);
76
+		$this->define('THEME_NAME', $theme->get('Name'));
77
+		$this->define('THEME_PATH', get_template_directory().'/');
78
+		$this->define('THEME_DIR', get_template_directory_uri().'/');
79
+		$this->define('THEME_VERSION', $theme->get('Version'));
80
+		$this->define('THEME_FRAMEWORK_PATH', THEME_PATH.'app/');
81
+		$this->define('THEME_FRAMEWORK_DIR', THEME_DIR.'app/');
82 82
 	}
83 83
 
84 84
 	/**
85 85
 	 * Include core files that are responsible for theme render
86 86
 	 */
87 87
 	private function include_core_files() {
88
-		require_once THEME_PATH . 'vendor/autoload.php';
88
+		require_once THEME_PATH.'vendor/autoload.php';
89 89
 
90 90
 		// Basis Class
91
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-basis.php';
91
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-basis.php';
92 92
 
93 93
 		// Theme Config
94
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-config.php';
94
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-config.php';
95 95
 	
96 96
 		// Scope
97
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-scope.php';
97
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-scope.php';
98 98
 
99 99
 		// Template Loader
100
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-template.php';
100
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-template.php';
101 101
 
102 102
 		// Helper functions
103
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-helper.php';
103
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-helper.php';
104 104
 
105 105
 		// Query Helper
106
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-query-helper.php';
106
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-query-helper.php';
107 107
 
108 108
 		// Menu
109
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu.php';
110
-		require_once THEME_FRAMEWORK_PATH . 'classy/classy-menu-item.php';
109
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu.php';
110
+		require_once THEME_FRAMEWORK_PATH.'classy/classy-menu-item.php';
111 111
 
112 112
 		// Appearance
113
-		require_once THEME_FRAMEWORK_PATH . 'appearance.php';
113
+		require_once THEME_FRAMEWORK_PATH.'appearance.php';
114 114
 	}
115 115
 
116 116
 	/**
117 117
 	 * Include theme Object-Orienter models
118 118
 	 */
119 119
 	private function include_models() {
120
-		$files = (array) glob( THEME_FRAMEWORK_PATH . '/models/*.php' );
120
+		$files = (array) glob(THEME_FRAMEWORK_PATH.'/models/*.php');
121 121
 
122
-		foreach ( $files as $filename ) {
122
+		foreach ($files as $filename) {
123 123
 
124
-			if ( !empty($filename) ) {
124
+			if (!empty($filename)) {
125 125
 
126 126
 				require_once $filename;
127 127
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 				
208 208
 					$_return[] = new ClassyPost($post_id);
209 209
 				
210
-				} elseif($return_type == 'object') {
210
+				} elseif ($return_type == 'object') {
211 211
 
212 212
 					$_return[] = get_post($post_id);
213 213
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	public static function get_post($args = false, $return_type = 'ClassyPost') {
235 235
 		$posts = self::get_posts($args, $return_type);
236 236
 
237
-		if ( $post = reset($posts ) ) {
237
+		if ($post = reset($posts)) {
238 238
 			return $post;
239 239
 		}
240 240
 	}
@@ -243,57 +243,57 @@  discard block
 block discarded – undo
243 243
 	 * @param array   $prefs
244 244
 	 * @return array mixed
245 245
 	 */
246
-	public static function get_pagination( $prefs = array() ) {
246
+	public static function get_pagination($prefs = array()) {
247 247
 		global $wp_query;
248 248
 		global $paged;
249 249
 		global $wp_rewrite;
250 250
 
251 251
 		$args = array();
252
-		$args['total'] = ceil( $wp_query->found_posts / $wp_query->query_vars['posts_per_page'] );
252
+		$args['total'] = ceil($wp_query->found_posts / $wp_query->query_vars['posts_per_page']);
253 253
 		
254
-		if ( $wp_rewrite->using_permalinks() ) {
254
+		if ($wp_rewrite->using_permalinks()) {
255 255
 			
256
-			$url = explode( '?', get_pagenum_link( 0 ) );
256
+			$url = explode('?', get_pagenum_link(0));
257 257
 			
258
-			if ( isset( $url[1] ) ) {
259
-				parse_str( $url[1], $query );
258
+			if (isset($url[1])) {
259
+				parse_str($url[1], $query);
260 260
 				$args['add_args'] = $query;
261 261
 			}
262 262
 			
263 263
 			$args['format'] = 'page/%#%';
264
-			$args['base'] = trailingslashit( $url[0] ).'%_%';
264
+			$args['base'] = trailingslashit($url[0]).'%_%';
265 265
 
266 266
 		} else {
267 267
 			$big = 999999999;
268
-			$args['base'] = str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) );
268
+			$args['base'] = str_replace($big, '%#%', esc_url(get_pagenum_link($big)));
269 269
 		}
270 270
 
271 271
 		$args['type'] = 'array';
272
-		$args['current'] = max( 1, get_query_var( 'paged' ) );
273
-		$args['mid_size'] = max( 9 - $args['current'], 3 );
272
+		$args['current'] = max(1, get_query_var('paged'));
273
+		$args['mid_size'] = max(9 - $args['current'], 3);
274 274
 		$args['prev_next'] = false;
275 275
 		
276
-		if ( is_int( $prefs ) ) {
276
+		if (is_int($prefs)) {
277 277
 			$args['mid_size'] = $prefs - 2;
278 278
 		} else {
279
-			$args = array_merge( $args, $prefs );
279
+			$args = array_merge($args, $prefs);
280 280
 		}
281 281
 
282 282
 		$data = array();
283
-		$data['pages'] = ClassyHelper::paginate_links( $args );
284
-		$next = get_next_posts_page_link( $args['total'] );
283
+		$data['pages'] = ClassyHelper::paginate_links($args);
284
+		$next = get_next_posts_page_link($args['total']);
285 285
 		
286
-		if ( $next ) {
287
-			$data['next'] = array( 'link' => untrailingslashit( $next ), 'class' => 'page-numbers next' );
286
+		if ($next) {
287
+			$data['next'] = array('link' => untrailingslashit($next), 'class' => 'page-numbers next');
288 288
 		}
289 289
 
290
-		$prev = previous_posts( false );
290
+		$prev = previous_posts(false);
291 291
 		
292
-		if ( $prev ) {
293
-			$data['prev'] = array( 'link' => untrailingslashit( $prev ), 'class' => 'page-numbers prev' );
292
+		if ($prev) {
293
+			$data['prev'] = array('link' => untrailingslashit($prev), 'class' => 'page-numbers prev');
294 294
 		}
295 295
 		
296
-		if ( $paged < 2 ) {
296
+		if ($paged < 2) {
297 297
 			$data['prev'] = null;
298 298
 		}
299 299
 		
Please login to merge, or discard this patch.
app/classy/classy-template.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 		$template = str_replace('.', '/', $template);
31 31
 
32
-		return THEME_PATH . self::$theme_templates_folder . '/' . $template . '.blade.php';			
32
+		return THEME_PATH.self::$theme_templates_folder.'/'.$template.'.blade.php';			
33 33
 
34 34
 	}
35 35
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 		foreach ($templates as $template) {
62 62
 
63
-			if ( self::template_exists($template) ):
63
+			if (self::template_exists($template)):
64 64
 
65 65
 				return $template;
66 66
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
 		// Home
88 88
 
89
-		if ( $type == 'home' ) :
89
+		if ($type == 'home') :
90 90
 
91 91
 			$templates[] = 'home';
92 92
 			$templates[] = 'index';
@@ -94,32 +94,32 @@  discard block
 block discarded – undo
94 94
 
95 95
 		// Single
96 96
 
97
-		elseif ( $type == 'single' ) :
97
+		elseif ($type == 'single') :
98 98
 
99
-			$post_type = get_query_var( 'post_type' );
99
+			$post_type = get_query_var('post_type');
100 100
 
101
-			$templates[] = 'single-' . $post_type;
101
+			$templates[] = 'single-'.$post_type;
102 102
 
103 103
 			$templates[] = 'single';
104 104
 
105 105
 		// Post type
106 106
 
107
-		elseif ( $type == 'post_type_archive' ) :
107
+		elseif ($type == 'post_type_archive') :
108 108
 
109
-			$post_type = get_query_var( 'post_type' );
109
+			$post_type = get_query_var('post_type');
110 110
 
111
-			$templates[] = 'archive-' . $post_type;
111
+			$templates[] = 'archive-'.$post_type;
112 112
 
113 113
 			$templates[] = 'archive';
114 114
 
115 115
 
116 116
 		// Taxonomy
117 117
 
118
-		elseif ( $type == 'taxonomy' ):
118
+		elseif ($type == 'taxonomy'):
119 119
 
120 120
 			$term = get_queried_object();
121 121
 
122
-			if ( ! empty( $term->slug ) ) {
122
+			if (!empty($term->slug)) {
123 123
 				
124 124
 				$taxonomy = $term->taxonomy;
125 125
 
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 
133 133
 		// Category
134 134
 
135
-		elseif ( $type == 'category' ):
135
+		elseif ($type == 'category'):
136 136
 
137 137
 			$category = get_queried_object();
138 138
 
139
-			if ( ! empty( $category->slug ) ) {
139
+			if (!empty($category->slug)) {
140 140
 				$templates[] = "category-{$category->slug}";
141 141
 				$templates[] = "category-{$category->term_id}";
142 142
 			}
@@ -145,23 +145,23 @@  discard block
 block discarded – undo
145 145
 
146 146
 		// Attachment
147 147
 
148
-		elseif ( $type == 'attachment' ):
148
+		elseif ($type == 'attachment'):
149 149
 
150 150
 			$attachment = get_queried_object();
151 151
 
152
-			if ( $attachment ) {
152
+			if ($attachment) {
153 153
 
154
-				if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
154
+				if (false !== strpos($attachment->post_mime_type, '/')) {
155 155
 				
156
-					list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
156
+					list($type, $subtype) = explode('/', $attachment->post_mime_type);
157 157
 				
158 158
 				} else {
159 159
 				
160
-					list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
160
+					list($type, $subtype) = array($attachment->post_mime_type, '');
161 161
 				
162 162
 				}
163 163
 
164
-				if ( ! empty( $subtype ) ) {
164
+				if (!empty($subtype)) {
165 165
 					$templates[] = "{$type}-{$subtype}";
166 166
 					$templates[] = "{$subtype}";
167 167
 				}
@@ -173,11 +173,11 @@  discard block
 block discarded – undo
173 173
 
174 174
 		// Tag
175 175
 
176
-		elseif ( $type == 'tag' ):
176
+		elseif ($type == 'tag'):
177 177
 
178 178
 			$tag = get_queried_object();
179 179
 
180
-			if ( ! empty( $tag->slug ) ) {
180
+			if (!empty($tag->slug)) {
181 181
 				$templates[] = "tag-{$tag->slug}";
182 182
 				$templates[] = "tag-{$tag->term_id}";
183 183
 			}
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 		// Author
188 188
 
189
-		elseif ( $type == 'author' ):
189
+		elseif ($type == 'author'):
190 190
 
191 191
 			$author = get_queried_object();
192 192
 
193
-			if ( $author instanceof WP_User ) {
193
+			if ($author instanceof WP_User) {
194 194
 				$templates[] = "author-{$author->user_nicename}";
195 195
 				$templates[] = "author-{$author->ID}";
196 196
 			}
@@ -199,32 +199,32 @@  discard block
 block discarded – undo
199 199
 
200 200
 		// Front Page
201 201
 
202
-		elseif ( $type == 'front-page' ):
202
+		elseif ($type == 'front-page'):
203 203
 
204 204
 			$id = get_queried_object_id();
205 205
 
206 206
 			$pagename = get_query_var('pagename');
207 207
 
208
-			if ( ! $pagename && $id ) {
208
+			if (!$pagename && $id) {
209 209
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
210 210
 				$post = get_queried_object();
211
-				if ( $post )
211
+				if ($post)
212 212
 					$pagename = $post->post_name;
213 213
 			}
214 214
 
215 215
 			$template = get_post_meta('theme-page-template', $id);
216 216
 
217
-			if ( $template != 'index' )
217
+			if ($template != 'index')
218 218
 				$templates[] = $template;
219
-			if ( $pagename )
219
+			if ($pagename)
220 220
 				$templates[] = "page-$pagename";
221
-			if ( $id )
221
+			if ($id)
222 222
 				$templates[] = "page-$id";
223 223
 			$templates[] = '';
224 224
 
225 225
 		// Page
226 226
 
227
-		elseif ( $type == 'page' ):
227
+		elseif ($type == 'page'):
228 228
 
229 229
 			$id = get_queried_object_id();
230 230
 			
@@ -232,18 +232,18 @@  discard block
 block discarded – undo
232 232
 
233 233
 			$pagename = get_query_var('pagename');
234 234
 
235
-			if ( ! $pagename && $id ) {
235
+			if (!$pagename && $id) {
236 236
 				// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
237 237
 				$post = get_queried_object();
238
-				if ( $post )
238
+				if ($post)
239 239
 					$pagename = $post->post_name;
240 240
 			}
241 241
 
242
-			if ( $template != 'index' )
242
+			if ($template != 'index')
243 243
 				$templates[] = $template;
244
-			if ( $pagename )
244
+			if ($pagename)
245 245
 				$templates[] = "page-$pagename";
246
-			if ( $id )
246
+			if ($id)
247 247
 				$templates[] = "page-$id";
248 248
 			$templates[] = 'page';
249 249
 
@@ -269,37 +269,37 @@  discard block
 block discarded – undo
269 269
 	 */
270 270
 	public static function get_current_page() {
271 271
 
272
-		if ( is_404() && $template = self::get_available_template('404') ) :
272
+		if (is_404() && $template = self::get_available_template('404')) :
273 273
 
274
-		elseif ( is_search() && $template = self::get_available_template('search') ) :
274
+		elseif (is_search() && $template = self::get_available_template('search')) :
275 275
 
276
-		elseif ( is_front_page() && $template = self::get_available_template('front-page') ) :
276
+		elseif (is_front_page() && $template = self::get_available_template('front-page')) :
277 277
 
278
-		elseif ( is_home() && $template = self::get_available_template('home') ) :
278
+		elseif (is_home() && $template = self::get_available_template('home')) :
279 279
 
280
-		elseif ( is_post_type_archive() && $template = self::get_available_template('post_type_archive') ) :
280
+		elseif (is_post_type_archive() && $template = self::get_available_template('post_type_archive')) :
281 281
 
282
-		elseif ( is_tax() && $template = self::get_available_template('taxonomy') ) :
282
+		elseif (is_tax() && $template = self::get_available_template('taxonomy')) :
283 283
 
284
-		elseif ( is_attachment() && $template = self::get_available_template('attachment') ) :
284
+		elseif (is_attachment() && $template = self::get_available_template('attachment')) :
285 285
 
286
-		elseif ( is_single() && $template = self::get_available_template('single') ) :
286
+		elseif (is_single() && $template = self::get_available_template('single')) :
287 287
 
288
-		elseif ( is_page() && $template = self::get_available_template('page') ) :
288
+		elseif (is_page() && $template = self::get_available_template('page')) :
289 289
 
290
-		elseif ( is_singular() && $template = self::get_available_template('singular') ) :
290
+		elseif (is_singular() && $template = self::get_available_template('singular')) :
291 291
 
292
-		elseif ( is_category() && $template = self::get_available_template('category') ) :
292
+		elseif (is_category() && $template = self::get_available_template('category')) :
293 293
 
294
-		elseif ( is_tag() && $template = self::get_available_template('tag') ) :
294
+		elseif (is_tag() && $template = self::get_available_template('tag')) :
295 295
 
296
-		elseif ( is_author() && $template = self::get_available_template('author') ) :
296
+		elseif (is_author() && $template = self::get_available_template('author')) :
297 297
 
298
-		elseif ( is_date() && $template = self::get_available_template('date') ) :
298
+		elseif (is_date() && $template = self::get_available_template('date')) :
299 299
 
300
-		elseif ( is_archive() && $template = self::get_available_template('archive') ) :
300
+		elseif (is_archive() && $template = self::get_available_template('archive')) :
301 301
 
302
-		elseif ( is_paged() && $template = self::get_available_template('paged') ) :
302
+		elseif (is_paged() && $template = self::get_available_template('paged')) :
303 303
 
304 304
 		else :
305 305
 		
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
 		} else {
328 328
 
329
-			return $template . '.' . $template;
329
+			return $template.'.'.$template;
330 330
 			
331 331
 		}
332 332
 
@@ -368,8 +368,8 @@  discard block
 block discarded – undo
368 368
 	 */
369 369
 	public static function render($template = null, $data = null) {
370 370
 
371
-		$views = THEME_PATH . self::$theme_templates_folder;
372
-		$cache = WP_CONTENT_DIR . '/templatecache';
371
+		$views = THEME_PATH.self::$theme_templates_folder;
372
+		$cache = WP_CONTENT_DIR.'/templatecache';
373 373
 		$common_scope = ClassyScope::get_common_scope();
374 374
 
375 375
 		if ($template !== null && is_string($template)) {
Please login to merge, or discard this patch.