From caf24e36628ec381169b574399f52c90ec9fb3de Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Wed, 5 Sep 2012 20:02:14 +1000
Subject: [PATCH] SF Bug #3427748 - value id is ignored in select attribute

---
 lib/Attribute.php          | 4 ++--
 lib/SelectionAttribute.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Attribute.php b/lib/Attribute.php
index af134df..9c4ef98 100644
--- a/lib/Attribute.php
+++ b/lib/Attribute.php
@@ -778,7 +778,7 @@ class Attribute {
 
 					case 'value':
 						if (is_array($value))
-							foreach ($value as $y) {
+							foreach ($value as $x => $y) {
 								if (! $this->haveMoreValues()) {
 									system_message(array(
 									'title'=>_('Automatically removed attribute values from template'),
@@ -790,7 +790,7 @@ class Attribute {
 									break;
 
 								} else
-									$this->addValue($y);
+									$this->addValue($x,$y);
 							}
 
 						else
diff --git a/lib/SelectionAttribute.php b/lib/SelectionAttribute.php
index deb1f11..5f1c8bb 100644
--- a/lib/SelectionAttribute.php
+++ b/lib/SelectionAttribute.php
@@ -41,7 +41,7 @@ class SelectionAttribute extends Attribute {
 		if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
 			debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs);
 
-		$this->addOption($new_val,$new_val);
+		$this->addOption($new_val,$i);
 	}
 
 	public function getOptionCount() {