add warning about queries that don't specify 'connected_type'. fixes #…

…131
scribu · Mar 21, 2012 · 9708732 · 9708732
1 parent c744fe8
commit 9708732
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/core/query-post.php b/core/query-post.php
@@ -38,7 +38,7 @@ function posts_clauses( $clauses, $wp_query ) {
 
 		$qv = P2P_Query::get_qv( $wp_query->query_vars );
 
-		if ( empty( $qv['items'] ) )
+		if ( !$qv )
 			return $clauses;
 
 		$wp_query->_p2p_cache = true;

diff --git a/core/query-user.php b/core/query-user.php
@@ -25,7 +25,7 @@ function pre_user_query( $query ) {
 
 		$qv = P2P_Query::get_qv( $q );
 
-		if ( empty( $qv['items'] ) )
+		if ( !$qv )
 			return;
 
 		$map = array(

diff --git a/core/query.php b/core/query.php
@@ -16,8 +16,12 @@ function expand_shortcut_qv( &$q ) {
 			}
 		}
 
-		if ( !isset( $q['connected_type'] ) )
+		if ( !isset( $q['connected_type'] ) ) {
+			if ( isset( $q['connected_items'] ) ) {
+				trigger_error( "P2P queries without 'connected_type' are no longer supported." );
+			}
 			return false;
+		}
 
 		if ( !isset( $q['connected_items'] ) )
 			$q['connected_items'] = 'any';
@@ -26,6 +30,9 @@ function expand_shortcut_qv( &$q ) {
 	}
 
 	function get_qv( $q ) {
+		if ( !isset( $q['p2p_type'] ) )
+			return false;
+
 		$qv_list = array(
 			'items', 'direction', 'meta',
 			'orderby', 'order_num', 'order'
@@ -35,8 +42,6 @@ function get_qv( $q ) {
 			$qv[$key] = isset( $q["connected_$key"] ) ?  $q["connected_$key"] : false;
 		}
 
-		$qv['p2p_type'] = isset( $q['p2p_type'] ) ? $q['p2p_type'] : false;
-
 		return $qv;
 	}