[.803][Bug/Interface] Right-click causes attack instead of talk

In 2A:

Here are 2 cases where right-click causes the selected unit to attack a recruitable NPC instead of talking to them, even though the mouse icon shows the "talk" graphic:

Example save: http://dl.dropbox.com/u/8067364/Beta_2a/B2A-ERR-RClick-attacks-from-city.EleSav

Case 1: The selected unit is stationed inside a city:

1. Load save.
2. Select city "Eyiess"
3. Select unit "Rilis" (stationed in city)
4. Mouse over NPC "Bannon Highsley" -- Mouse icon shows "talk" graphic (correct).
5. Right-click on Bannon Highsley.
6. Rilis attacks Bannon Highsley.

This also happens if you replace "Rilis" with the sovereign (move sovereign into city, select sovereign, right-click on NPC).

Case 2: The selected unit is part of an army:

1. Load save.
2. Select one of the Sentinels in the sovereign's army.
3. Right-click on "Bannon Highsley".
4. Sentinel attacks Bannon Highsley.