Skip to content

Commit d56fd61

Browse files
author
Leonid Vakulenko
committed
plugins/yandexmarket v.2.5.2
* Улучшили поддержку последних версий PHP.
1 parent 324da94 commit d56fd61

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

plugins/yandexmarket/lib/actions/backend/shopYandexmarketPluginRun.controller.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3665,7 +3665,8 @@ private function format($field, $value, $info = array(), $data = array(), $sku_d
36653665
sort($value);
36663666
$value = implode('-', $value);
36673667
} else {
3668-
$value = max(0, max($value));
3668+
$value[] = 0;
3669+
$value = max($value);
36693670
}
36703671
} else {
36713672
$value = null;
@@ -4003,8 +4004,8 @@ private function escapeValue($value)
40034004
if (defined('ENT_XML1')) {
40044005
$flags |= constant('ENT_XML1');
40054006
}
4006-
$value = htmlspecialchars(trim($value), $flags, $this->encoding);
4007-
return $value;
4007+
4008+
return $value ? htmlspecialchars(trim($value), $flags, $this->encoding) : '';
40084009
}
40094010

40104011
private function checkMinPrice($price)

plugins/yandexmarket/lib/config/plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'description' => 'Экспорт товаров в формате YML',
66
'img' => 'img/yandexmarket.png',
77
'vendor' => 'webasyst',
8-
'version' => '2.5.1',
8+
'version' => '2.5.2',
99
'importexport' => 'profiles',
1010
'export_profile' => true,
1111
'custom_settings' => true,

plugins/yandexmarket/templates/actions/backend/BackendSetup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ <h2>6. Промоакции</h2>
879879
</script>
880880

881881
{foreach $smarty.capture as $name => $template}
882-
{if strpos($name,'template-js')}
882+
{if strpos(ifempty($name, ''), 'template-js')}
883883
<!-- begin {$name} -->
884884
<script type="text/x-jquery-tmpl" id="{$name}">{$template|regex_replace:'@(^.*-->)|(<!\-\-.*$)@m':''|replace:'</':'<\/'}</script>
885885
<!-- end {$name} -->

plugins/yandexmarket/templates/actions/backend/mapField.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="value no-shift{if !empty($info.required)} js-required{/if}">
1414
{* Field data source selector *}
1515
{if $info.type neq 'adjustable'}
16-
{if strpos($info.source,'field:')===0}
16+
{if strpos(ifempty($info, 'source', '') ,'field:')===0}
1717
<b>{$fields[substr($info.source, 6)]|default:$info.name|escape}</b>
1818
{else}
1919
<b>{$info.source}</b>
@@ -37,7 +37,7 @@
3737
{/foreach}
3838
{/if}
3939
{if !$param && (empty($info.sources) || in_array('custom',$info.sources))}
40-
<option value="text:%s"{if strpos(ifset($info['source']),'text:')===0}{$selected = true} selected{/if}>Пользовательское значение</option>
40+
<option value="text:%s"{if strpos(ifempty($info, 'source', ''), 'text:')===0}{$selected = true} selected{/if}>Пользовательское значение</option>
4141
{/if}
4242

4343
</optgroup>
@@ -112,11 +112,11 @@
112112

113113
{* Field source feature autocomplete *}
114114
{if !empty($features_autocomplete)}<input type="hidden" name="map[{$type_id}][{$field}][feature]" value="">
115-
<input type="search" class="js-autocomplete-feature{if strpos($field,'param')===0}-param{/if}" title="Поиск характеристики по названию или коду" placeholder="Начните набирать название или код характеристики" style="display:none;">
115+
<input type="search" class="js-autocomplete-feature{if strpos(ifempty($field, ''), 'param')===0}-param{/if}" title="Поиск характеристики по названию или коду" placeholder="Начните набирать название или код характеристики" style="display:none;">
116116
{/if}
117117

118118
{* Field source user value *}
119-
<input type="text" name="map[{$type_id}][{$field}][text]" class="js-value-custom long" placeholder="Пользовательское значение"{if strpos(ifset($info['source']),'text:')!==0} value="" style="display: none;"{else} value="{$info['source']|regex_replace:'@^text:@':''|escape}"{/if}>
119+
<input type="text" name="map[{$type_id}][{$field}][text]" class="js-value-custom long" placeholder="Пользовательское значение"{if strpos(ifempty($info, 'source', ''), 'text:')!==0} value="" style="display: none;"{else} value="{$info['source']|regex_replace:'@^text:@':''|escape}"{/if}>
120120
<a href="{$js_base_href|default:'#'}/source/select/{$type_id}/{$field}/" class="js-action" style="display: none;"><span class="icon text-red"><i class="fas fa-times-circle"></i></span></a>
121121
{/if}
122122

0 commit comments

Comments
 (0)