handle situation where post type is not set

crowdfavorite · Jul 18, 2013 · c66a01d · c66a01d
1 parent c276450
commit c66a01d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,8 @@
 
 - Add support for "sticky" posts (sticky.php, single-sticky.php, feed-sticky.php) in the post context
 - Set default context to archive instead of home
+- Properly load type-* templates in General context
+- Requires WordPress 3.6 (for get_post() returning global $post)
 
 ## 3.4
 

diff --git a/utility.php b/utility.php
@@ -489,6 +489,11 @@ function cfct_choose_general_template_type($dir, $files) {
 	$files = cfct_type_templates($dir, $files);
 	if (count($files)) {
 		$type = get_query_var('post_type');
+		// post type not always set in query var - let's make a guess
+		if (empty($type)) {
+			$post = get_post(); // requires WP 3.6
+			$type = $post->post_type;
+		}
 		$file = 'type-'.$type.'.php';
 		if (in_array($file, $files)) {
 			return $file;