When Cav are disordered by their proximity to Elephants. Does the disorder cease automatically when they get out of range or do they have to take a cohesion test?

When a unit autobreaks and a General is attached but not fighting in the front rank. Does the General die also?