svn commit: [jahia] r18485 - /trunk/core/src/java/org/jahia/bin/JahiaAdministration.java

[tdraier]

Author: tdraier
Date: Fri Sep 14 13:30:17 2007
New Revision: 18485

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18485&repname=
=3Djahia
Log:
keep current language when switching site in administration if possible (JA=
HIA-1388) (port 18335)

Modified:
    trunk/core/src/java/org/jahia/bin/JahiaAdministration.java

Modified: trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaAdministration.java&rev=3D18485&repname=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
--- trunk/core/src/java/org/jahia/bin/JahiaAdministration.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaAdministration.java Fri Sep 14 1=
3:30:17 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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list