Call LoadExpirePolicy() unconditionally, this fixes the apparent snap back to old...

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 91509781466de4b029010cd5852d08e4900f4ac0..7a93d44af096e10b43b155c49a502584d88cc3bc 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -74,7 +74,7 @@ int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP)
        which = GetTemplateTokenNumber(Target, TP, 2, 0);
        CompareWith = GetTemplateTokenNumber(Target, TP, 3, 0);
 
-       if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+       LoadExpirePolicy(which);
        
        return WCC->Policy[which].expire_mode == CompareWith;
 }
@@ -85,7 +85,7 @@ void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
                
        which = GetTemplateTokenNumber(Target, TP, 0, 0);
-       if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+       LoadExpirePolicy(which);
        StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_value);
 }
 
@@ -96,7 +96,7 @@ void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
                
        which = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+       LoadExpirePolicy(which);
        StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_mode);
 }
 
@@ -259,8 +259,10 @@ void load_siteconfig(void)
        }
        FreeStrBuf(&Buf);
 
-       LoadExpirePolicy(sitepolicy);
+       LoadExpirePolicy(roompolicy);
+       LoadExpirePolicy(floorpolicy);
        LoadExpirePolicy(mailboxespolicy);
+       LoadExpirePolicy(sitepolicy);
 }