Author: ssmiweve
Date: 2008-09-19 10:38:30 +0200 (Fri, 19 Sep 2008)
New Revision: 6829
Modified:
branches/2.17/war/src/main/webapp/WEB-INF/jsp/500.jsp
Log:
Issue SKER4739: (Exception when accessing a non-existing skin)
Modified: branches/2.17/war/src/main/webapp/WEB-INF/jsp/500.jsp
===================================================================
--- branches/2.17/war/src/main/webapp/WEB-INF/jsp/500.jsp 2008-09-18
13:33:39 UTC (rev 6828)
+++ branches/2.17/war/src/main/webapp/WEB-INF/jsp/500.jsp 2008-09-19
08:38:30 UTC (rev 6829)
@@ -7,19 +7,22 @@
<search:velocity template="/pages/500"/>
</c:catch>
-<%-- At the bare minimum display the following --%>
-<c:if test="${!empty error || !empty Missing_pages500_Template}">
+<%-- If this site does not exist redirect to super domain (for now hardcoded
to sesam.com) --%>
+<c:if test="${!empty error}"><c:redirect url="http://sesam.com"/></c:if>
+
+<%-- At the bare minimum display the following basic 500 error page --%>
+<c:if test="${!empty Missing_pages500_Template}">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>500 - Internal error</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="icon" href="/images/favicon.gif" type="image/x-icon" />
- <link rel="shortcut icon" href="/images/favicon.gif"
type="image/x-icon" />
+ <link rel="icon" href="http://sesam.com/images/favicon.gif"
type="image/x-icon" />
+ <link rel="shortcut icon" href="http://sesam.com/images/favicon.gif"
type="image/x-icon" />
</head>
<body style="margin:0; padding:0;">
- <div style="width:100%; height:6px; background:#A6408E;"><img
src="/images/pix.gif" width="1" height="6" alt="" /></div>
- <img src="/images/logo.jpg" width="146" height="44"
style="padding:20px 0 10px 30px;" alt="logo" />
+ <div style="width:100%; height:6px; background:#A6408E;"><img
src="http://sesam.com/images/pix.gif" width="1" height="6" alt="" /></div>
+ <img src="http://sesam.com/images/logo.png" width="146" height="44"
style="padding:20px 0 10px 30px;" alt="logo" />
<div style="padding-left:30px; font-size:12px; font-family: arial,
sans-serif;">
<p>500 Internal Server Error
The server encountered an unexpected condition which prevented
it from fulfilling the request.</p>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits