Author: tdraier
Date: Fri Aug 31 18:17:58 2007
New Revision: 18335
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18335&repname=
=3Djahia
Log:
keep current language when switching site in administration if possible (JA=
HIA-1388)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdm=
inistration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D18335&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAdministr=
ation.java Fri Aug 31 18:17:58 2007
@@ -929,7 +929,7 @@
try {
currentSite =3D ServicesRegistry.getInstance().getJahiaSit=
esService().getSite(siteID);
List languageSettingsAsLocales =3D currentSite.getLanguage=
SettingsAsLocales(true);
- if (languageSettingsAsLocales !=3D null && languageSetting=
sAsLocales.size() > 0) {
+ if (languageSettingsAsLocales !=3D null && languageSetting=
sAsLocales.size() > 0 && !languageSettingsAsLocales.contains(session.getAtt=
ribute(ProcessingContext.SESSION_LOCALE))) {
Object o =3D languageSettingsAsLocales.get(0);
session.setAttribute(Globals.LOCALE_KEY, o);
session.setAttribute(ProcessingContext.SESSION_LOCALE,=
o);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
