Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / webcit / roomviews.c

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index c1f23fa1adc7060d4a448812d28a3365e4a3472d..f297bc020112f035a0e6ed8036dbbe5eaa0ad671 100644 (file)
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -22,7 +22,7 @@ ROOM_VIEWS allowed_default_views[VIEW_MAX] = {
        0, /* VIEW_CALBRIEF     Brief Calendar */
        0, /* VIEW_JOURNAL      Journal */
        0, /* VIEW_DRAFTS       Drafts */
-       0  /* VIEW_BLOG         Blog */
+       1  /* VIEW_BLOG         Blog */
 };
 
 /*
@@ -262,7 +262,7 @@ InitModule_ROOMVIEWS
        RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
 
        RegisterConditional(HKEY("COND:THISROOM:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:GROUPDAV_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
+       RegisterConditional(HKEY("COND:ROOM:dav_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
 
        RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE);
        RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, NULL, CTX_ROOMS);