commit 2a341fc0bda23e538f13168997c658f79cf7487d Author: Joel Pittet Date: Wed Feb 27 01:44:45 2013 -0800 1898448-21 diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc index 36c313d..e1f0b56 100644 --- a/core/modules/search/search.pages.inc +++ b/core/modules/search/search.pages.inc @@ -72,15 +72,15 @@ function search_view($module = NULL, $keys = '') { } /** - * Prepocesses the variables for search-results.tpl.php. + * Prepares variables for search results templates. * - * @param $variables + * Default template: search-results.html.twig. + * + * @param (array) $variables * An array with the following elements: * - results: Search results array. * - module: Module the search results came from (module implementing * hook_search_info()). - * - * @see search-results.tpl.php */ function template_preprocess_search_results(&$variables) { $variables['search_results'] = ''; @@ -105,15 +105,21 @@ function template_preprocess_search_results(&$variables) { } /** - * Preprocesses the variables for search-result.tpl.php. + * Prepares variables for individual search result templates. * - * @param $variables + * Default template: search-result.html.twig + * + * @param (array) $variables * An array with the following elements: - * - result: Search results array. + * - result: Individual search result. * - module: Module the search results came from (module implementing * hook_search_info()). - * - * @see search-result.tpl.php + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * - title_attributes: HTML attributes for the title. + * - content_attributes: HTML attributes for the content. */ function template_preprocess_search_result(&$variables) { $language_interface = language(LANGUAGE_TYPE_INTERFACE); diff --git a/core/modules/search/templates/search-result.html.twig b/core/modules/search/templates/search-result.html.twig index 445b573..41b094b 100644 --- a/core/modules/search/templates/search-result.html.twig +++ b/core/modules/search/templates/search-result.html.twig @@ -4,7 +4,7 @@ * Default theme implementation for displaying a single search result. * * This template renders a single search result and is collected into - * search-results.twig. This and the parent template are + * search-results.html.twig. This and the parent template are * dependent to one another sharing the markup for ordered lists. * * Available variables: diff --git a/core/modules/search/templates/search-results.html.twig b/core/modules/search/templates/search-results.html.twig index 81b35d7..7631297 100644 --- a/core/modules/search/templates/search-results.html.twig +++ b/core/modules/search/templates/search-results.html.twig @@ -14,6 +14,7 @@ * - search_results: All results as it is rendered through search-result.tpl.php * - module: The machine-readable name of the module (tab) being searched, such * as 'node' or 'user' + * - pager: The pager next/prev links to display, if any. * - help: HTML for help text to display when no results are found. * * @see template_preprocess()