Completed
Pull Request — master (#770)
by
unknown
05:58
created
lib/timber-post.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 	 * @param mixed $pid
169 169
 	 */
170 170
 	public function __construct($pid = null) {
171
-		$pid = $this->determine_id( $pid );
171
+		$pid = $this->determine_id($pid);
172 172
 		$this->init($pid);
173 173
 	}
174 174
 
@@ -188,13 +188,13 @@  discard block
 block discarded – undo
188 188
 			&& get_class($wp_query->queried_object) == 'WP_Post'
189 189
 			) {
190 190
 			$pid = $wp_query->queried_object_id;
191
-		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
191
+		} else if ( $pid === null && $wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id ) {
192 192
 			//hack for static page as home page
193 193
 			$pid = $wp_query->queried_object_id;
194 194
 		} else if ( $pid === null ) {
195 195
 			$gtid = false;
196 196
 			$maybe_post = get_post();
197
-			if ( isset($maybe_post->ID) ){
197
+			if ( isset($maybe_post->ID) ) {
198 198
 				$gtid = true;
199 199
 			}
200 200
 			if ( $gtid ) {
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 * @param string $field
261 261
 	 * @param mixed $value
262 262
 	 */
263
-	public function update( $field, $value ) {
263
+	public function update($field, $value) {
264 264
 		if ( isset($this->ID) ) {
265 265
 			update_post_meta($this->ID, $field, $value);
266 266
 			$this->$field = $value;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 * @param mixed $pid
276 276
 	 * @return WP_Post on success
277 277
 	 */
278
-	protected function prepare_post_info( $pid = 0 ) {
278
+	protected function prepare_post_info($pid = 0) {
279 279
 		if ( is_string($pid) || is_numeric($pid) || (is_object($pid) && !isset($pid->post_title)) || $pid === 0 ) {
280 280
 			$pid = self::check_post_id($pid);
281 281
 			$post = get_post($pid);
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	 * @internal
298 298
 	 * @return integer ID number of a post
299 299
 	 */
300
-	protected function check_post_id( $pid ) {
300
+	protected function check_post_id($pid) {
301 301
 		if ( is_numeric($pid) && $pid === 0 ) {
302 302
 			$pid = get_the_ID();
303 303
 			return $pid;
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 		global $wpdb;
324 324
 		$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $post_name);
325 325
 		$result = $wpdb->get_row($query);
326
-		if (!$result) {
326
+		if ( !$result ) {
327 327
 			return null;
328 328
 		}
329 329
 		return $result->ID;
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 				$text = TimberHelper::trim_words($text, $len, false);
363 363
 				$trimmed = true;
364 364
 			}
365
-			$text = do_shortcode( $text );
365
+			$text = do_shortcode($text);
366 366
 		}
367 367
 		if ( !strlen($text) ) {
368 368
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
@@ -391,11 +391,11 @@  discard block
 block discarded – undo
391 391
 			}
392 392
 			$read_more_class = apply_filters('timber/post/get_preview/read_more_class', "read-more");
393 393
 			if ( $readmore && isset($readmore_matches) && !empty($readmore_matches[1]) ) {
394
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore_matches[1]) . '</a>';
394
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore_matches[1]) . '</a>';
395 395
 			} elseif ( $readmore ) {
396
-				$text .= ' <a href="' . $this->get_permalink() . '" class="'.$read_more_class .'">' . trim($readmore) . '</a>';
396
+				$text .= ' <a href="' . $this->get_permalink() . '" class="' . $read_more_class . '">' . trim($readmore) . '</a>';
397 397
 			}
398
-			if ( !$strip && $last_p_tag && ( strpos($text, '<p>') || strpos($text, '<p ') ) ) {
398
+			if ( !$strip && $last_p_tag && (strpos($text, '<p>') || strpos($text, '<p ')) ) {
399 399
 				$text .= '</p>';
400 400
 			}
401 401
 		}
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 	 * @internal
408 408
 	 * @param bool|int $pid a post ID number
409 409
 	 */
410
-	function import_custom( $pid = false ) {
410
+	function import_custom($pid = false) {
411 411
 		if ( !$pid ) {
412 412
 			$pid = $this->ID;
413 413
 		}
@@ -422,13 +422,13 @@  discard block
 block discarded – undo
422 422
 	 * @param int $pid
423 423
 	 * @return array
424 424
 	 */
425
-	protected function get_post_custom( $pid ) {
425
+	protected function get_post_custom($pid) {
426 426
 		apply_filters('timber_post_get_meta_pre', array(), $pid, $this);
427 427
 		$customs = get_post_custom($pid);
428 428
 		if ( !is_array($customs) || empty($customs) ) {
429 429
 			return array();
430 430
 		}
431
-		foreach ( $customs as $key => $value ) {
431
+		foreach ($customs as $key => $value) {
432 432
 			if ( is_array($value) && count($value) == 1 && isset($value[0]) ) {
433 433
 				$value = $value[0];
434 434
 			}
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 	 * @param bool $taxonomy
483 483
 	 * @return TimberPost|boolean
484 484
 	 */
485
-	function get_next( $taxonomy = false ) {
485
+	function get_next($taxonomy = false) {
486 486
 		if ( !isset($this->_next) || !isset($this->_next[$taxonomy]) ) {
487 487
 			global $post;
488 488
 			$this->_next = array();
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 		$post = $this;
514 514
 		$ret = array();
515 515
 		if ( $multipage ) {
516
-			for ( $i = 1; $i <= $numpages; $i++ ) {
516
+			for ($i = 1; $i <= $numpages; $i++) {
517 517
 				$link = self::get_wp_link_page($i);
518 518
 				$data = array('name' => $i, 'title' => $i, 'text' => $i, 'link' => $link);
519 519
 				if ( $i == $page ) {
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 	 * @param bool $taxonomy
566 566
 	 * @return TimberPost|boolean
567 567
 	 */
568
-	function get_prev( $taxonomy = false ) {
568
+	function get_prev($taxonomy = false) {
569 569
 		if ( isset($this->_prev) && isset($this->_prev[$taxonomy]) ) {
570 570
 			return $this->_prev[$taxonomy];
571 571
 		}
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
 		$post->slug = $post->post_name;
633 633
 		$customs = $this->get_post_custom($post->ID);
634 634
 		$post->custom = $customs;
635
-		$post = (object) array_merge((array)$customs, (array)$post);
635
+		$post = (object) array_merge((array) $customs, (array) $post);
636 636
 		return $post;
637 637
 	}
638 638
 
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 	 * @param string $use
644 644
 	 * @return string
645 645
 	 */
646
-	function get_display_date( $use = 'post_date' ) {
646
+	function get_display_date($use = 'post_date') {
647 647
 		return date(get_option('date_format'), strtotime($this->$use));
648 648
 	}
649 649
 
@@ -653,9 +653,9 @@  discard block
 block discarded – undo
653 653
 	 * @param  string $date_format
654 654
 	 * @return string
655 655
 	 */
656
-	function get_date( $date_format = '' ) {
656
+	function get_date($date_format = '') {
657 657
 		$df = $date_format ? $date_format : get_option('date_format');
658
-		$the_date = (string)mysql2date($df, $this->post_date);
658
+		$the_date = (string) mysql2date($df, $this->post_date);
659 659
 		return apply_filters('get_the_date', $the_date, $df);
660 660
 	}
661 661
 
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 	 * @param  string $date_format
665 665
 	 * @return string
666 666
 	 */
667
-	function get_modified_date( $date_format = '' ) {
667
+	function get_modified_date($date_format = '') {
668 668
 		$df = $date_format ? $date_format : get_option('date_format');
669 669
 		$the_time = $this->get_modified_time($df);
670 670
 		return apply_filters('get_the_modified_date', $the_time, $date_format);
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
 	 * @param  string $time_format
676 676
 	 * @return string
677 677
 	 */
678
-	function get_modified_time( $time_format = '' ) {
678
+	function get_modified_time($time_format = '') {
679 679
 		$tf = $time_format ? $time_format : get_option('time_format');
680 680
 		$the_time = get_post_modified_time($tf, false, $this->ID, true);
681 681
 		return apply_filters('get_the_modified_time', $the_time, $time_format);
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 	 * @param bool|string 	$childPostClass
689 689
 	 * @return array
690 690
 	 */
691
-	function get_children( $post_type = 'any', $childPostClass = false ) {
691
+	function get_children($post_type = 'any', $childPostClass = false) {
692 692
 		if ( $childPostClass === false ) {
693 693
 			$childPostClass = $this->PostClass;
694 694
 		}
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 			$post_type = $this->post_type;
697 697
 		}
698 698
 		$children = get_children('post_parent=' . $this->ID . '&post_type=' . $post_type . '&numberposts=-1&orderby=menu_order title&order=ASC');
699
-		foreach ( $children as &$child ) {
699
+		foreach ($children as &$child) {
700 700
 			$child = new $childPostClass($child->ID);
701 701
 		}
702 702
 		$children = array_values($children);
@@ -732,25 +732,25 @@  discard block
 block discarded – undo
732 732
 		}
733 733
 
734 734
 		if ( $user_ID ) {
735
-			$args['include_unapproved'] = array( $user_ID );
736
-		} elseif ( ! empty( $comment_author_email ) ) {
737
-			$args['include_unapproved'] = array( $comment_author_email );
735
+			$args['include_unapproved'] = array($user_ID);
736
+		} elseif ( !empty($comment_author_email) ) {
737
+			$args['include_unapproved'] = array($comment_author_email);
738 738
 		}
739 739
 
740 740
 		$comments = get_comments($args);
741 741
 		$timber_comments = array();
742 742
 
743 743
 		if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
744
-			set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
744
+			set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
745 745
 			$overridden_cpage = true;
746 746
 		}
747 747
 
748
-        foreach( $comments as $key => &$comment ) {
748
+        foreach ($comments as $key => &$comment) {
749 749
             $timber_comment = new $CommentClass($comment);
750 750
             $timber_comments[$timber_comment->id] = $timber_comment;
751 751
         }
752 752
 
753
-		foreach( $timber_comments as $key => $comment ) {
753
+		foreach ($timber_comments as $key => $comment) {
754 754
 			if ( $comment->is_child() ) {
755 755
 				unset($timber_comments[$comment->id]);
756 756
 
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 	 * @param string $TermClass
795 795
 	 * @return array
796 796
 	 */
797
-	function get_terms( $tax = '', $merge = true, $TermClass = '' ) {
797
+	function get_terms($tax = '', $merge = true, $TermClass = '') {
798 798
 
799 799
 		$TermClass = $TermClass ?: $this->TermClass;
800 800
 
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
 			$taxonomies = $tax;
806 806
 		}
807 807
 		if ( is_string($tax) ) {
808
-			if ( in_array($tax, array('all','any','')) ) {
808
+			if ( in_array($tax, array('all', 'any', '')) ) {
809 809
 				$taxonomies = get_object_taxonomies($this->post_type);
810 810
 			} else {
811 811
 				$taxonomies = array($tax);
@@ -814,8 +814,8 @@  discard block
 block discarded – undo
814 814
 
815 815
 		$term_class_objects = array();
816 816
 
817
-		foreach ( $taxonomies as $taxonomy ) {
818
-			if ( in_array($taxonomy, array('tag','tags')) ) {
817
+		foreach ($taxonomies as $taxonomy) {
818
+			if ( in_array($taxonomy, array('tag', 'tags')) ) {
819 819
 				$taxonomy = 'post_tag';
820 820
 			}
821 821
 			if ( $taxonomy == 'categories' ) {
@@ -853,11 +853,11 @@  discard block
 block discarded – undo
853 853
 	 * @param string $taxonomy
854 854
 	 * @return bool
855 855
 	 */
856
-	function has_term( $term_name_or_id, $taxonomy = 'all' ) {
856
+	function has_term($term_name_or_id, $taxonomy = 'all') {
857 857
 		if ( $taxonomy == 'all' || $taxonomy == 'any' ) {
858 858
 			$taxes = get_object_taxonomies($this->post_type, 'names');
859 859
 			$ret = false;
860
-			foreach ( $taxes as $tax ) {
860
+			foreach ($taxes as $tax) {
861 861
 				if ( has_term($term_name_or_id, $tax, $this->ID) ) {
862 862
 					$ret = true;
863 863
 					break;
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
 	 * @param string $field
873 873
 	 * @return TimberImage
874 874
 	 */
875
-	function get_image( $field ) {
875
+	function get_image($field) {
876 876
 		return new $this->ImageClass($this->$field);
877 877
 	}
878 878
 
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
922 922
 	 * @param int $page
923 923
 	 * @return string
924 924
 	 */
925
-	function get_content( $len = 0, $page = 0 ) {
925
+	function get_content($len = 0, $page = 0) {
926 926
 		if ( $len == 0 && $page == 0 && $this->_content ) {
927 927
 			return $this->_content;
928 928
 		}
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
 	 * @param string $field_name
984 984
 	 * @return mixed
985 985
 	 */
986
-	public function get_field( $field_name ) {
986
+	public function get_field($field_name) {
987 987
 		$value = apply_filters('timber_post_get_meta_field_pre', null, $this->ID, $field_name, $this);
988 988
 		if ( $value === null ) {
989 989
 			$value = get_post_meta($this->ID, $field_name);
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
 	/**
1002 1002
 	 * @param string $field_name
1003 1003
 	 */
1004
-	function import_field( $field_name ) {
1004
+	function import_field($field_name) {
1005 1005
 		$this->$field_name = $this->get_field($field_name);
1006 1006
 	}
1007 1007
 
@@ -1032,13 +1032,13 @@  discard block
 block discarded – undo
1032 1032
 	 * ```
1033 1033
 	 * @return string a space-seperated list of classes
1034 1034
 	 */
1035
-	public function post_class( $class='' ) {
1035
+	public function post_class($class = '') {
1036 1036
 		global $post;
1037 1037
 		$old_global_post = $post;
1038 1038
 		$post = $this;
1039 1039
 		$class_array = get_post_class($class, $this->ID);
1040 1040
 		$post = $old_global_post;
1041
-		if ( is_array($class_array) ){
1041
+		if ( is_array($class_array) ) {
1042 1042
 			return implode(' ', $class_array);
1043 1043
 		}
1044 1044
 		return $class_array;
@@ -1140,8 +1140,8 @@  discard block
 block discarded – undo
1140 1140
 	 * @param string|bool $childPostClass _optional_ a custom post class (ex: 'MyTimberPost') to return the objects as. By default (false) it will use TimberPost::$post_class value.
1141 1141
 	 * @return array
1142 1142
 	 */
1143
-	public function children( $post_type = 'any', $childPostClass = false ) {
1144
-		return $this->get_children( $post_type, $childPostClass );
1143
+	public function children($post_type = 'any', $childPostClass = false) {
1144
+		return $this->get_children($post_type, $childPostClass);
1145 1145
 	}
1146 1146
 
1147 1147
 	/**
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 	 * ```
1166 1166
 	 * @return bool|array
1167 1167
 	 */
1168
-	public function comments( $count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment' ) {
1168
+	public function comments($count = 0, $order = 'wp', $type = 'comment', $status = 'approve', $CommentClass = 'TimberComment') {
1169 1169
 		return $this->get_comments($count, $order, $type, $status, $CommentClass);
1170 1170
 	}
1171 1171
 
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
 	 * @param int $page
1183 1183
 	 * @return string
1184 1184
 	 */
1185
-	public function content( $page = 0 ) {
1185
+	public function content($page = 0) {
1186 1186
 		return $this->get_content(0, $page);
1187 1187
 	}
1188 1188
 
@@ -1211,7 +1211,7 @@  discard block
 block discarded – undo
1211 1211
 	 * @param string $date_format
1212 1212
 	 * @return string
1213 1213
 	 */
1214
-	public function date( $date_format = '' ) {
1214
+	public function date($date_format = '') {
1215 1215
 		return $this->get_date($date_format);
1216 1216
 	}
1217 1217
 
@@ -1233,9 +1233,9 @@  discard block
 block discarded – undo
1233 1233
 	 * @param string $time_format
1234 1234
 	 * @return string
1235 1235
 	 */
1236
-	public function time( $time_format = '' ) {
1236
+	public function time($time_format = '') {
1237 1237
 		$tf = $time_format ? $time_format : get_option('time_format');
1238
-	 	$the_time = (string)mysql2date($tf, $this->post_date);
1238
+	 	$the_time = (string) mysql2date($tf, $this->post_date);
1239 1239
 	 	return apply_filters('get_the_time', $the_time, $tf);
1240 1240
 	}
1241 1241
 
@@ -1271,7 +1271,7 @@  discard block
 block discarded – undo
1271 1271
 	 * @param string $field_name
1272 1272
 	 * @return mixed
1273 1273
 	 */
1274
-	public function meta( $field_name = null ) {
1274
+	public function meta($field_name = null) {
1275 1275
 		if ( $field_name === null ) {
1276 1276
 			//on the off-chance the field is actually named meta
1277 1277
 			$field_name = 'meta';
@@ -1282,7 +1282,7 @@  discard block
 block discarded – undo
1282 1282
 	/**
1283 1283
 	 * @return string
1284 1284
 	 */
1285
-	public function name(){
1285
+	public function name() {
1286 1286
 		return $this->title();
1287 1287
 	}
1288 1288
 
@@ -1290,7 +1290,7 @@  discard block
 block discarded – undo
1290 1290
 	 * @param string $date_format
1291 1291
 	 * @return string
1292 1292
 	 */
1293
-	public function modified_date( $date_format = '' ) {
1293
+	public function modified_date($date_format = '') {
1294 1294
 		return $this->get_modified_date($date_format);
1295 1295
 	}
1296 1296
 
@@ -1298,7 +1298,7 @@  discard block
 block discarded – undo
1298 1298
 	 * @param string $time_format
1299 1299
 	 * @return string
1300 1300
 	 */
1301
-	public function modified_time( $time_format = '' ) {
1301
+	public function modified_time($time_format = '') {
1302 1302
 		return $this->get_modified_time($time_format);
1303 1303
 	}
1304 1304
 
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 	 * @param bool $in_same_cat
1308 1308
 	 * @return mixed
1309 1309
 	 */
1310
-	public function next( $in_same_cat = false ) {
1310
+	public function next($in_same_cat = false) {
1311 1311
 		return $this->get_next($in_same_cat);
1312 1312
 	}
1313 1313
 
@@ -1365,7 +1365,7 @@  discard block
 block discarded – undo
1365 1365
 	 * @param bool $in_same_cat
1366 1366
 	 * @return mixed
1367 1367
 	 */
1368
-	public function prev( $in_same_cat = false ) {
1368
+	public function prev($in_same_cat = false) {
1369 1369
 		return $this->get_prev($in_same_cat);
1370 1370
 	}
1371 1371
 
@@ -1377,7 +1377,7 @@  discard block
 block discarded – undo
1377 1377
 	 * @param bool $merge Should the resulting array be one big one (true)? Or should it be an array of sub-arrays for each taxonomy (false)?
1378 1378
 	 * @return array
1379 1379
 	 */
1380
-	public function terms( $tax = '', $merge = true ) {
1380
+	public function terms($tax = '', $merge = true) {
1381 1381
 		return $this->get_terms($tax, $merge);
1382 1382
 	}
1383 1383
 
Please login to merge, or discard this patch.