[CMF-checkins] SVN: CMF/branches/1.5/CMFCore/dtml/cachingPolicies.dtml - Use and/or instead of test(), was bombing with TypeError on Zope 2.8

[Sidnei da Silva]

Log message for revision 40730:
  
  - Use and/or instead of test(), was bombing with TypeError on Zope 2.8
  

Changed:
  U   CMF/branches/1.5/CMFCore/dtml/cachingPolicies.dtml

-=-
Modified: CMF/branches/1.5/CMFCore/dtml/cachingPolicies.dtml
===================================================================
--- CMF/branches/1.5/CMFCore/dtml/cachingPolicies.dtml	2005-12-12 15:43:31 UTC (rev 40729)
+++ CMF/branches/1.5/CMFCore/dtml/cachingPolicies.dtml	2005-12-12 15:56:57 UTC (rev 40730)
@@ -26,8 +26,8 @@
                 e304_checked="getEnable304s() and 'checked' or ''"
                 s_max_age_secs="getSMaxAgeSecs() is not None and getSMaxAgeSecs() or ''"
                 last_modified_checked="getLastModified() and 'checked' or ''"
-                pre_check="test(getPreCheck() is None, '', getPreCheck())"
-                post_check="test(getPostCheck() is None, '', getPostCheck())">
+                pre_check="getPreCheck() is not None and getPreCheck() or ''"
+                post_check="getPostCheck() is not None and getPostCheck() or ''">
 
        <input type="hidden" name="policy_id" value="&dtml-getPolicyId;">
        <input type="hidden" name="no_cache:default:int" value="0">