ComboBox double-escaping HTML entities in inlined data

[guest]

Items containing HTML entities in a ComboBox? are displayed incorrectly. The ampersand is always converted to "&", even if it is already part of an escape sequence. Example:

<option>Foo & Bar</option> becomes "Foo &amp; Bar"

and

<option>Foo &amp; Bar</option> becomes "Foo &amp;amp; Bar"

Both IE7 and FF2 did this. The innerHTML attribute seems to be the culprit. I changed line 542 of ComboBox?.js from

return { value: node.getAttribute("value"), name: String(node.innerHTML) };

to

return { value: node.getAttribute("value"), name: String(node.innerText||node.textContent) };

and it works correctly. (Is a CLA required for a 1-line fix?)

[bill]

No CLA required for one line fixes; I'll put this into 1.1. (The code has changed but looks like the same problem is still there.)

[bill]

(In [11947]) Fixes #5501: ComboBox? double-escaping HTML entities in inlined data

[bill]

Another fix in [11949].