Navigation

Changeset 33

Timestamp:

08/31/06 19:56:29 (2 years ago)

Author:

mikey

Message:

fix: used getName() instead of getKey(), last gives correct value for array key

Files:

r25	r33
55	55	// attribute has not been set and there is no
56	56	// default value, skip the method call
57		if (null == $val) {
	57	if (null === $val) {
58	58	continue;
59	59	}
…	…
81	81
82	82	foreach ($children as $child) {
83		$val = $child->getConvertedValue();
84		// attribute has not been set and there is no
85		// default value, skip the method call
86		if (null == $val) {
	83	if (null != $child->getContent()) {
	84	$val = $child->getContent();
	85	} else {
	86	$val = $child->getConvertedValue();
	87	}
	88
	89	if (null === $val) {
87	90	continue;
88	91	}
89	92
90		$childDef = $child->getDefinition();
91		if ($childDef->getName() == '__none') {
	93	if ($child->getKey() === null \|\| $child->getKey() == '__none' \|\| strlen($child->getKey()) === 0) {
92	94	$array[] = $val;
93	95	} else {
94		$array[$child->get~~Name~~()] = $val;
	96	$array[$child->getKey()] = $val;
95	97	}
96	98	}