hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused highlighting parameters

Browse Source
This commit is contained in:
Benoît Burnichon
2016-03-29 19:11:48 +02:00
parent 37883ed1ae
commit c89bf664b5
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/classes/caption/record.php
View File

@@ -216,15 +216,12 @@ SQL;
}
/**
*
* @param string $highlight
* @param array $grep_fields
* @param SearchEngineInterface $searchEngine
* @param Boolean $includeBusiness
*
* @param string $highlight
* @param array $grep_fields
* @param bool $includeBusiness
* @return array
*/
public function get_highlight_fields($highlight = '', Array $grep_fields = null, SearchEngineInterface $searchEngine = null, $includeBusiness = false, SearchEngineOptions $options = null)
public function get_highlight_fields($highlight = '', array $grep_fields = null, $includeBusiness = false)
{
$fields = [];

2
lib/classes/record/adapter.php
View File

@@ -870,7 +870,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
}
if (count($fields_to_retrieve) > 0) {
$retrieved_fields = $this->get_caption()->get_highlight_fields($highlight, $fields_to_retrieve, $searchEngine);
$retrieved_fields = $this->get_caption()->get_highlight_fields($highlight, $fields_to_retrieve);
$titles = [];
foreach ($retrieved_fields as $value) {
foreach ($value['values'] as $v) {

2
templates/web/common/macros.html.twig
View File

@@ -103,7 +103,7 @@
{% endmacro %}
{% macro format_caption(record, highlight, search_engine, include_business, bounceable, technical_data) %}
{% for field in record.get_caption().get_highlight_fields(highlight, null, search_engine, include_business) %}
{% for field in record.get_caption().get_highlight_fields(highlight, null, include_business) %}
{% set extra_classes = ['pair'] %}
{% if loop.index is odd %}
{% set extra_classes = ['impair'] %}