xlawrence 2005/07/12 12:35:21 CEST
Modified files:
core/src/webapp/jsp/jahia/htmleditors/fckeditor utils.jsp
core/src/webapp/jsp/jahia/htmleditors/xinha utils.jsp
Log:
typo
Revision Changes Path
1.10 +1 -1
jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp.diff?r1=1.9&r2=1.10&f=h
1.11 +17 -17
jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp.diff?r1=1.10&r2=1.11&f=h
Index: utils.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/fckeditor/utils.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- utils.jsp 5 Jul 2005 15:46:48 -0000 1.9
+++ utils.jsp 12 Jul 2005 10:35:20 -0000 1.10
@@ -250,7 +250,7 @@
if (contentPage == null) {
continue;
}
- String templateName =
contentPage.getPageTemplate(jData.params()).getSourcePath();
+ String templateName =
contentPage.getPageTemplate(jParams).getSourcePath();
templateName =
templateName.substring(templateName.lastIndexOf("/") + 1);
if (! templateName.equals("listeContacts.jsp") &&
!templateName.equals("email.jsp") &&
Index: utils.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/htmleditors/xinha/utils.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- utils.jsp 5 Jul 2005 15:46:48 -0000 1.10
+++ utils.jsp 12 Jul 2005 10:35:21 -0000 1.11
@@ -90,27 +90,27 @@
} else {
if (curDf.getChildren().size() > 0) {
isValideExt = true;
- if (lang.equals("fr")) {
- for (int i = 0; i < pathSearch.length; i++) {
- if (pathDisplay.equals(pathSearch[i])) {
- pathDisplay = pathReplace[i];
+ if (lang.equals("fr")) {
+ for (int i = 0; i < pathSearch.length; i++) {
+ if (pathDisplay.equals(pathSearch[i])) {
+ pathDisplay = pathReplace[i];
+ }
+ }
}
}
}
- }
- }
if (isValideExt) {
- expand = curDf.getPath();
- expand = expand.replaceAll("'", "\\\'");
- expand = expand.replaceAll("\"", """);
-
- pathDisplay = pathDisplay.replaceAll("'", "\\\'");
-
-
buff.append("[").append(level).append(",").append(counterOperations)
-
.append(",\'").append(pathDisplay).append("\','").append(expand)
- .append("'],");
+ expand = curDf.getPath();
+ expand = expand.replaceAll("'", "\\\'");
+ expand = expand.replaceAll("\"", """);
+
+ pathDisplay = pathDisplay.replaceAll("'", "\\\'");
+
+
buff.append("[").append(level).append(",").append(counterOperations)
+
.append(",\'").append(pathDisplay).append("\','").append(expand)
+ .append("'],");
- counterOperations++;
+ counterOperations++;
}
buff.append(expandOne(curDf, level + 1, lang));
}
@@ -250,7 +250,7 @@
if (contentPage == null) {
continue;
}
- String templateName =
contentPage.getPageTemplate(jData.params()).getSourcePath();
+ String templateName =
contentPage.getPageTemplate(jParams).getSourcePath();
templateName =
templateName.substring(templateName.lastIndexOf("/") + 1);
if (! templateName.equals("listeContacts.jsp") &&
!templateName.equals("email.jsp") &&
