Commit 318fac54 authored by Marc Bertrand's avatar Marc Bertrand Committed by Thomas Seiber
Browse files

Issue #2159827 by .bert, drunken monkey: Fixed regression with wrong search... 

Issue #2159827 by .bert, drunken monkey: Fixed regression with wrong search base paths in Facet API adapter.
parent 8095c8d3

CHANGELOG.txt

+2 −0
Original line number Diff line number Diff line 
Search API 1.x, dev (xxxx-xx-xx):

---------------------------------

- #2159827 by .bert, drunken monkey: Fixed regression with wrong search base

  paths in Facet API adapter.

- #3215213 by drunken monkey: Fixed undefined index "#value" in

  SearchApiViewsHandlerFilterFulltext::exposed_validate().

contrib/search_api_facetapi/search_api_facetapi.module

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ function search_api_facetapi_current_search_path(SearchApiQueryInterface $query 
  if ($query && $query->getOption('search_api_base_path')) {

    $path = $query->getOption('search_api_base_path');

  }

  return $path;

  // If the path has not been set (yet), return the current path as a fallback.

  return $path ? $path : current_path();

}



/**

contrib/search_api_views/includes/query.inc

+5 −2
Original line number Diff line number Diff line
@@ -319,8 +319,11 @@ class SearchApiViewsQuery extends views_plugin_query { 
      $this->query->setOption('search_api_bypass_access', TRUE);

    }



    // Store the Views base path.

    $this->query->setOption('search_api_base_path', $this->view->get_path());

    // Store the Views base path, if we have one.

    $path = $this->view->get_path();

    if ($path) {

      $this->query->setOption('search_api_base_path', $path);

    }



    // Save query information for Views UI.

    $view->build_info['query'] = (string) $this->query;