From 543dc5cef0e1baed94fe5ed28d0bdf7aaf00d52b Mon Sep 17 00:00:00 2001 From: EGO7000 Date: Mon, 31 Jul 2017 16:44:03 +0300 Subject: [PATCH] Fix for issue #20. Link: https://github.com/webber12/eFilter/issues/20 --- .../assets/snippets/snippet.eFilterResult.tpl | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/install/assets/snippets/snippet.eFilterResult.tpl b/install/assets/snippets/snippet.eFilterResult.tpl index 4b7b261..7cbb5df 100644 --- a/install/assets/snippets/snippet.eFilterResult.tpl +++ b/install/assets/snippets/snippet.eFilterResult.tpl @@ -1,7 +1,7 @@ //getPlaceholder('eFilter_ids'); @@ -33,7 +33,7 @@ if($ids == '' && (isset($_GET))) { if($val != '0' && $val != '') {$ids = '2';} } } - if ($ids == $modx->config['site_start']) {$ids = '';} + if ($ids == $modx->config['site_start']) {$ids = '';} } if($ids == '' && (isset($_GET['f']))) { $ids = $modx->config['site_start']; @@ -43,7 +43,7 @@ if($ids == '' && (isset($_GET['f']))) { if($val != '0' && $val != '') {$ids = '2';} } } - if ($ids == $modx->config['site_start']) {$ids = '';} + if ($ids == $modx->config['site_start']) {$ids = '';} } //получаем из плейсхолдера список ТВ для вывода в список @@ -68,7 +68,7 @@ if (isset($exclude_tvs_from_list) && $exclude_tvs_from_list != '') { -//заменяем плейсхолдер [+params+] в чанке вывода товаров +//заменяем плейсхолдер [+params+] в чанке вывода товаров //на нужный вывод параметров товаров //шаблоны вывода параметра в списке по умолчанию $paramRow = isset($paramRow) ? $paramRow : '
[+param_title+]: [+param_value+]
'; @@ -92,8 +92,12 @@ $tovar_params_wrapper = str_replace( ); $tovarChunkName = isset($params['tpl']) && !empty($params['tpl']) ? $params['tpl'] : $tovarChunkName; -$tovarChunk = $modx->getChunk($tovarChunkName); -$tovarChunk = '@CODE: ' . str_replace('[+params+]', $tovar_params_wrapper, $tovarChunk); +if ($tovarChunkName{0} !== '@') { + $tovarChunk = $modx->getChunk($tovarChunkName); + $tovarChunk = '@CODE: ' . str_replace('[+params+]', $tovar_params_wrapper, $tovarChunk); +} else { + $tovarChunk = str_replace('[+params+]', $tovar_params_wrapper, $tovarChunkName); +} $params['tpl'] = $tovarChunk; ///////конец замены чанка вывода товаров