Apostrophes in sitename - problem with site dropdown list #2398

When using apostrophes in a sitename, the sitename is incorrectly displayed in the dropdown list that is located in the top-right corner of the site visualization page.

For instance, "Cahiers de l'Education" is displayed as "Cahiers de l'ducation" (see attached picture).

This seems to be an HTML encoding problem.

I'm using Piwik 1.4, language is set to French.

Attachment: Screen capture
screen-capture.png

(In [4644]) Refs #2386
Fixes #2398

I'm not liking this code having 2 code paths but oh well...