commit 7cad2a6a8f39de2c4f6f2402bbb045b6688c40ee
Author: Damien Tournoud <damien@commerceguys.com>
Date:   Tue Feb 21 17:13:35 2012 +0100

    Plop.

diff --git a/contrib/search_api_views/includes/query.inc b/contrib/search_api_views/includes/query.inc
index ce6e6b6..2323bab 100644
--- a/contrib/search_api_views/includes/query.inc
+++ b/contrib/search_api_views/includes/query.inc
@@ -347,8 +347,8 @@ class SearchApiViewsQuery extends views_plugin_query {
    * If the current query isn't based on an entity type, the method will return
    * an empty array.
    */
-  public function get_result_entities($results, $relationship = NULL, $field = NULL) {
-    list($type, $wrappers) = $this->get_result_wrappers($results, $relationship, $field);
+  public function get_result_entities($results) {
+    list($type, $wrappers) = $this->get_result_wrappers($results);
     $return = array();
     foreach ($wrappers as $id => $wrapper) {
       try {
@@ -367,7 +367,7 @@ class SearchApiViewsQuery extends views_plugin_query {
    * This is necessary to support generic entity handlers and plugins with this
    * query backend.
    */
-  public function get_result_wrappers($results, $relationship = NULL, $field = NULL) {
+  public function get_result_wrappers($results) {
     $is_entity = (boolean) entity_get_info($this->index->item_type);
     $wrappers = array();
     $load_entities = array();
@@ -391,26 +391,7 @@ class SearchApiViewsQuery extends views_plugin_query {
       }
     }
 
-    // Apply the relationship, if necessary.
-    $type = $this->index->item_type;
-    $selector_suffix = '';
-    if ($field && ($pos = strrpos($field, ':'))) {
-      $selector_suffix = substr($field, 0, $pos);
-    }
-    if ($selector_suffix || ($relationship && !empty($this->view->relationship[$relationship]))) {
-      // Use EntityFieldHandlerHelper to compute the correct data selector for
-      // the relationship.
-      $handler = (object) array(
-        'view' => $this->view,
-        'relationship' => $relationship,
-        'real_field' => '',
-      );
-      $selector = EntityFieldHandlerHelper::construct_property_selector($handler);
-      $selector .= ($selector ? ':' : '') . $selector_suffix;
-      list($type, $wrappers) = EntityFieldHandlerHelper::extract_property_multiple($wrappers, $selector);
-    }
-
-    return array($type, $wrappers);
+    return array($this->index->item_type, $wrappers);
   }
 
   /**