Massive WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@407 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 19 insertions, 0 deletions

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index b9a046b..3a07002 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -1386,6 +1386,12 @@ function is_page ($page = '') {
 	return false;
 }
 
+function is_subpost () {
+	global $wp_query;
+
+	return $wp_query->is_subpost;
+}
+
 function is_archive () {
 	global $wp_query;
 
@@ -1871,6 +1877,19 @@ function get_single_template() {
 	return get_query_template('single');
 }
 
+function get_subpost_template() {
+	global $posts;
+	$type = explode('/', $posts[0]->post_type);
+	if ( $template = get_query_template($type[0]) )
+		return $template;
+	elseif ( $template = get_query_template($type[1]) )
+		return $template;
+	elseif ( $template = get_query_template("$type[0]_$type[1]") )
+		return $template;
+	else
+		return get_query_template('subpost');
+}
+
 function get_comments_popup_template() {
 	if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
 		$template = TEMPLATEPATH . '/comments-popup.php';