Forcing multi-lingual mode to use one of the configured languages doesn't work

--- src/main/java/com/xpn/xwiki/XWiki.java      (revision 36199)
+++ src/main/java/com/xpn/xwiki/XWiki.java      (working copy)
@@ -2519,7 +2519,7 @@
                 List<String> acceptedLanguages = getAcceptedLanguages(context.getRequest());
                 // We can force one of the configured languages to be accepted
                 if (Param("xwiki.language.forceSupported", "0").equals("1")) {
-                    List<String> available = Arrays.asList(getXWikiPreference("languages", context).split(", |"));
+                    List<String> available = Arrays.asList(getXWikiPreference("languages", context).split("[, |]"));
                     // Filter only configured languages
                     acceptedLanguages.retainAll(available);
                 }