Author: xlawrence
Date: Fri Jul 20 10:39:38 2007
New Revision: 18044
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18044&repname=
=3Djahia
Log:
correct compilation errors regarding isIE7 testing
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/se=
lectpage/select_page.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp&rev=3D=
18044&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp Fri Jul 20 10:39:38 2007
@@ -129,7 +129,8 @@
=
final String[] tabOptions =3D (String[]) engineMap.get("tabOptions=
");
final Integer activeTabOption =3D (Integer) engineMap.get("activeT=
abOption");
- boolean isIE7 =3D request.getHeader("User-agent") !=3D null && req=
uest.getHeader("User-agent").indexOf("MSIE 7") !=3D -1;
+ final String header =3D request.getHeader("User-agent");
+ final boolean isIE7 =3D header !=3D null && header.indexOf("MSIE 7=
") !=3D -1;
%>
=
<script type=3D"text/javascript">
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp&rev=3D18044=
&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp Fri Jul 20 10:39:38 2007
@@ -149,7 +149,8 @@
boolean isInternalLink =3D true; //default
boolean isPageMoving =3D true; //default
=
- boolean isIE7 =3D Boolean.valueOf(request.getHeader("User-agent") !=3D=
null && request.getHeader("User-agent").indexOf("MSIE 7") !=3D -1);
+ final String header =3D request.getHeader("User-agent");
+ final boolean isIE7 =3D header !=3D null && header.indexOf("MSIE 7") !=
=3D -1;
=
final ContentPage contentPage =3D jahiaPageBaseService.lookupContentPa=
ge(theField.getPageID(), false);
if (contentPage !=3D null) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
