Skip to content

Y
yii2
Commit c6076cb3 by Alexander Kochetov
Options

More refactoring

parent a834e104
Showing with 2 additions and 4 deletions
framework/yii/jui/Sortable.php
...@@ -107,10 +107,8 @@ class Sortable extends Widget ...@@ -107,10 +107,8 @@ class Sortable extends Widget
if (!isset($item['content'])) { if (!isset($item['content'])) {
throw new InvalidConfigException("The 'content' option is required."); throw new InvalidConfigException("The 'content' option is required.");
} }
if (isset($item['options'])) { $options = array_merge($options, ArrayHelper::getValue($item, 'options', array()));
$options = array_merge($options, $item['options']); $tag = ArrayHelper::remove($options, 'tag', $tag);
$tag = ArrayHelper::remove($options, 'tag', $tag);
}
$items[] = Html::tag($tag, $item['content'], $options); $items[] = Html::tag($tag, $item['content'], $options);
} else { } else {
$items[] = Html::tag($tag, $item, $options); $items[] = Html::tag($tag, $item, $options);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment