* rework who.c so it doesn't use svput() and friends but rather preregistered callbac...

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 05ba0517641b120952b981d89f85d51d1e130d1e..28bab53c1722e5aa16aaec35d432b50396aebdc9 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -693,7 +693,7 @@ int main(int argc, char **argv)
        TemplateCache = NewHash(1, NULL);
        GlobalNS = NewHash(1, NULL);
        Iterators = NewHash(1, NULL);
-       Contitionals = NewHash(1, NULL);
+       Conditionals = NewHash(1, NULL);
        MsgHeaderHandler = NewHash(1, NULL);
        MimeRenderHandler = NewHash(1, NULL);
 
@@ -876,12 +876,13 @@ int main(int argc, char **argv)
                perror("chdir");
        }
        LoadIconDir(static_icon_dir);
-       InitTemplateCache();
 
        initialise_modules();
        initialize_viewdefs();
        initialize_axdefs();
 
+       InitTemplateCache();
+
        if (!access("static.local/webcit.css", R_OK)) {
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
        }
@@ -979,7 +980,7 @@ void ShutDownWebcit(void)
        DeleteHash(&LocalTemplateCache);
        DeleteHash(&Iterators);
        DeleteHash(&MimeRenderHandler);
-       DeleteHash(&Contitionals);
+       DeleteHash(&Conditionals);
        DeleteHash(&MsgHeaderHandler);
 #ifdef ENABLE_NLS
        ShutdownLocale();