Commit 90e74b79 authored by Thomas Seiber's avatar Thomas Seiber
Browse files

Issue #1190324 by drunken monkey: Adapted to API change in Entity API.

parent d3a2cef1

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ API changes: 
- #1068342 by drunken monkey: Added a 'fields to run on' option for processors.



Others:

- #1190324 by drunken monkey: Adapted to API change in Entity API.

- #1168684 by drunken monkey: Added improved tokenizer defaults for English.

- #1163096 by drunken monkey: Fixed cached types for DB servers aren't correctly

  updated.

contrib/search_api_facets/search_api_facets.module

+2 −2
Changes for contrib/search_api_facets/search_api_facets.module: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ function search_api_facets_theme() { 
function search_api_facets_entity_info() {

  $info['search_api_facet'] = array(

    'label' => t('Search facet'),

    'controller class' => 'EntityAPIController',

    'controller class' => 'EntityAPIControllerExportable',

    'entity class' => 'SearchApiFacet',

    'base table' => 'search_api_facet',

    'uri callback' => 'search_api_facet_url',
@@ -839,7 +839,7 @@ function search_api_facet_load($id, $reset = FALSE) { 
 *   An array of SearchApiFacet objects keyed by machine name.

 */

function search_api_facet_load_multiple($ids = array(), $conditions = array(), $reset = FALSE) {

  return entity_load('search_api_facet', $ids, $conditions, $reset);

  return entity_load_multiple_by_name('search_api_facet', $ids, $conditions, $reset);

}



/**

search_api.install

+7 −0
Changes for search_api.install: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -809,3 +809,10 @@ function search_api_update_7108() { 
  db_add_field('search_api_index', 'read_only', $db_field);

  return t('Added a "read only" property to index entities.');

}



/**

 * Clear entity info cache, as entity controller classes hae changed.

 */

function search_api_update_7109() {

  cache_clear_all('entity_info:', 'cache', TRUE);

}

search_api.module

+4 −4
Changes for search_api.module: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ function search_api_cron() { 
function search_api_entity_info() {

  $info['search_api_server'] = array(

    'label' => t('Search server'),

    'controller class' => 'EntityAPIController',

    'controller class' => 'EntityAPIControllerExportable',

    'metadata controller class' => FALSE,

    'entity class' => 'SearchApiServer',

    'base table' => 'search_api_server',
@@ -257,7 +257,7 @@ function search_api_entity_info() { 
  );

  $info['search_api_index'] = array(

    'label' => t('Search index'),

    'controller class' => 'EntityAPIController',

    'controller class' => 'EntityAPIControllerExportable',

    'metadata controller class' => FALSE,

    'entity class' => 'SearchApiIndex',

    'base table' => 'search_api_index',
@@ -1343,7 +1343,7 @@ function search_api_server_load($id, $reset = FALSE) { 
 *   An array of server objects keyed by machine name.

 */

function search_api_server_load_multiple($ids = array(), $conditions = array(), $reset = FALSE) {

  return entity_load('search_api_server', $ids, $conditions, $reset);

  return entity_load_multiple_by_name('search_api_server', $ids, $conditions, $reset);

}



/**
@@ -1550,7 +1550,7 @@ function search_api_index_load($id, $reset = FALSE) { 
 *   An array of index objects keyed by machine name.

 */

function search_api_index_load_multiple($ids = array(), $conditions = array(), $reset = FALSE) {

  return entity_load('search_api_index', $ids, $conditions, $reset);

  return entity_load_multiple_by_name('search_api_index', $ids, $conditions, $reset);

}



/**