Browse Source

More refactoring

tags/2.0.0-beta
Alexander Kochetov 12 years ago
parent
commit
c6076cb314
  1. 4
      framework/yii/jui/Sortable.php

4
framework/yii/jui/Sortable.php

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

Loading…
Cancel
Save