php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 14:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
Alexander Kochetov
2013-05-26 18:30:36 +04:00
parent a834e1049d
commit c6076cb314
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/jui/Sortable.php
View File

@@ -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);