shuber 2004/10/28 20:44:02 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/fields ContentField.java
Log:
Fix for JAHIA-195 : Only fields that have a real value are now accepted in mandatory
language checks.
Please test this well, as it may have side effects.
Revision Changes Path
1.113.2.13 +6 -2 jahia/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.113.2.12&r2=1.113.2.13&f=h
Index: ContentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/fields/Attic/ContentField.java,v
retrieving revision 1.113.2.12
retrieving revision 1.113.2.13
diff -u -r1.113.2.12 -r1.113.2.13
--- ContentField.java 20 Oct 2004 09:46:05 -0000 1.113.2.12
+++ ContentField.java 28 Oct 2004 18:44:02 -0000 1.113.2.13
@@ -699,8 +699,12 @@
curSettings.getCode())) ||
(curEntryState.getLanguageCode().equals(
ContentField.SHARED_LANGUAGE))) {
- foundLanguage = true;
- break;
+ // now let's test if the entry actually has
+ // a value.
+ if (isEntryInitialized(curEntryState)) {
+ foundLanguage = true;
+ break;
+ }
}
}
