From d040cc13476ba8c4b65245e935bf7422fdbdd57c Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 6 Nov 2011 21:15:23 +0000
Subject: [PATCH] Don't set post_type QV in _post_format_request() when we're
 in the admin. props ethitter. fixes #18475.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/post.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/post.php b/wp-includes/post.php
index 923d92ba7f..3e65634015 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -5223,7 +5223,8 @@ function _post_format_request( $qvs ) {
 	if ( isset( $slugs[ $qvs['post_format'] ] ) )
 		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
 	$tax = get_taxonomy( 'post_format' );
-	$qvs['post_type'] = $tax->object_type;
+	if ( ! is_admin() )
+		$qvs['post_type'] = $tax->object_type;
 	return $qvs;
 }
 add_filter( 'request', '_post_format_request' );