SF Bug #3427748 - value id is ignored in select attribute
This commit is contained in:
parent
c4b6695beb
commit
caf24e3662
@ -778,7 +778,7 @@ class Attribute {
|
|||||||
|
|
||||||
case 'value':
|
case 'value':
|
||||||
if (is_array($value))
|
if (is_array($value))
|
||||||
foreach ($value as $y) {
|
foreach ($value as $x => $y) {
|
||||||
if (! $this->haveMoreValues()) {
|
if (! $this->haveMoreValues()) {
|
||||||
system_message(array(
|
system_message(array(
|
||||||
'title'=>_('Automatically removed attribute values from template'),
|
'title'=>_('Automatically removed attribute values from template'),
|
||||||
@ -790,7 +790,7 @@ class Attribute {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
} else
|
} else
|
||||||
$this->addValue($y);
|
$this->addValue($x,$y);
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -41,7 +41,7 @@ class SelectionAttribute extends Attribute {
|
|||||||
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
|
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
|
||||||
debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs);
|
debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs);
|
||||||
|
|
||||||
$this->addOption($new_val,$new_val);
|
$this->addOption($new_val,$i);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getOptionCount() {
|
public function getOptionCount() {
|
||||||
|
Loading…
Reference in New Issue
Block a user