LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better handling of language extension if an item is requested without language extension in the URL and does not exist in one of the languages transmitted in the accept language header. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4971 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-09-01 09:14:10 +00:00
parent 68f712cfc4
commit 70171a8e8c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-cms/src/com/arsdigita/cms/ContentSectionServlet.java
View File

@ -36,6 +36,7 @@ import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.kernel.ACSObjectCache;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelConfig;
import com.arsdigita.kernel.KernelContext;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.User;
@ -63,6 +64,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@ -287,7 +289,7 @@ public class ContentSectionServlet extends BaseApplicationServlet {
&& (!pathInfo.endsWith(".jsp") || !pathInfo.endsWith(".xml"))) {
if (pathInfo.lastIndexOf(".") == -1) {
final String lang;
String lang;
if (GlobalizationHelper.getSelectedLocale(sreq) == null) {
lang = GlobalizationHelper
.getNegotiatedLocale()
@ -297,6 +299,11 @@ public class ContentSectionServlet extends BaseApplicationServlet {
.getSelectedLocale(sreq)
.getLanguage();
}
if (getItem(section, url, sreq, sresp) == null) {
lang = KernelConfig.getConfig().getDefaultLanguage();
}
// try {
final StringBuffer redirectTo = new StringBuffer();
if (DispatcherHelper.getWebappContext() != null