projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commented out decodeHTML, as we don't encodeHTML anymore
[mir.git]
/
source
/
mircoders
/
entity
/
EntityContent.java
diff --git
a/source/mircoders/entity/EntityContent.java
b/source/mircoders/entity/EntityContent.java
index
01a9d1f
..
897d1de
100755
(executable)
--- a/
source/mircoders/entity/EntityContent.java
+++ b/
source/mircoders/entity/EntityContent.java
@@
-19,10
+19,13
@@
import mircoders.storage.*;
* this class implements mapping of one line of the database table content
* to a java object
*
* this class implements mapping of one line of the database table content
* to a java object
*
- * @version $Revision: 1.
8 $ $Date: 2002/06/28 20:37:33
$
+ * @version $Revision: 1.
9 $ $Date: 2002/07/19 20:55:49
$
* @author $Author: mh $
*
* $Log: EntityContent.java,v $
* @author $Author: mh $
*
* $Log: EntityContent.java,v $
+ * Revision 1.9 2002/07/19 20:55:49 mh
+ * commented out decodeHTML, as we don't encodeHTML anymore
+ *
* Revision 1.8 2002/06/28 20:37:33 mh
* make date_formatted be webdb_create_short instead to be more consistent. also make date2webdb.. use webdb_create
*
* Revision 1.8 2002/06/28 20:37:33 mh
* make date_formatted be webdb_create_short instead to be more consistent. also make date2webdb.. use webdb_create
*
@@
-274,7
+277,7
@@
public class EntityContent extends Entity
private String getContentDataParsed() {
String returnField = getValue("content_data");
private String getContentDataParsed() {
String returnField = getValue("content_data");
- if (
returnField!=null & returnField.length()>0
) {
+ if (
(returnField!=null) && (returnField.length()>0)
) {
returnField=StringUtil.deleteForbiddenTags(returnField);
//create http-links and email-links
if (getValue("is_html").equals("0")) {
returnField=StringUtil.deleteForbiddenTags(returnField);
//create http-links and email-links
if (getValue("is_html").equals("0")) {
@@
-282,7
+285,9
@@
public class EntityContent extends Entity
mirconf_mailLinkName,mirconf_extLinkName,
mirconf_intLinkName);
}
mirconf_mailLinkName,mirconf_extLinkName,
mirconf_intLinkName);
}
- returnField = StringUtil.decodeHTMLinTags(returnField);
+ // commented this out as I don't think it necessary as we don't
+ // "encodeHTML" in the first place anymore.. -mh 2002.07.19
+ //returnField = StringUtil.decodeHTMLinTags(returnField);
}
return returnField;
}
}
return returnField;
}