From be18b5d8cd8512693aa0fa3775eeae0f100071e6 Mon Sep 17 00:00:00 2001 From: orbiter Date: Thu, 4 Feb 2010 23:53:02 +0000 Subject: [PATCH] fix for 'cannot switch back to default language'-bug git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6649 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ConfigLanguage_p.java | 2 +- source/de/anomic/data/translator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htroot/ConfigLanguage_p.java b/htroot/ConfigLanguage_p.java index 6cc61add8..ac9bc3f1c 100644 --- a/htroot/ConfigLanguage_p.java +++ b/htroot/ConfigLanguage_p.java @@ -83,7 +83,7 @@ public class ConfigLanguage_p { * read from the language directory. This is very important to prevent * directory traversal attacks! */ - if (langFiles.contains(selectedLanguage)) { + if (langFiles.contains(selectedLanguage) || selectedLanguage.startsWith("default")) { translator.changeLang(env, langPath, selectedLanguage); } diff --git a/source/de/anomic/data/translator.java b/source/de/anomic/data/translator.java index 8eddc6aa0..36cb3e7fd 100644 --- a/source/de/anomic/data/translator.java +++ b/source/de/anomic/data/translator.java @@ -226,7 +226,7 @@ public class translator { final HashMap map = new HashMap(); int p; for (int i = 0; i < ms.length; i++) { - p = ms[i].indexOf("/"); + p = ms[i].indexOf('/'); if (p > 0) map.put(ms[i].substring(0, p), ms[i].substring(p + 1)); }