X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdav_main.c;fp=webcit%2Fdav_main.c;h=157c953976e4fc7ee05d2a092be5b6a9a467974e;hb=3841dfefb6b086720b6d5d9af39aaf8b19730e6d;hp=9d20819dc05af3cafb479b74b967b61684ff5f03;hpb=7cabeea6da9a3197dcb61eca4f7c2886b33d6257;p=citadel.git

diff --git a/webcit/dav_main.c b/webcit/dav_main.c
index 9d20819dc..157c95397 100644
--- a/webcit/dav_main.c
+++ b/webcit/dav_main.c
@@ -271,7 +271,7 @@ int Conditional_DAV_NSCURRENT(StrBuf *Target, WCTemplputParams *TP)
 	wcsession *WCC = WC;
 	void *vHandler;
 
-	vHandler = CTX;
+	vHandler = CTX(CTX_NONE);
 	return WCC->Hdr->HR.Handler == vHandler;
 }
 
@@ -282,8 +282,9 @@ void tmplput_DAV_NAMESPACE(StrBuf *Target, WCTemplputParams *TP)
 
 	if (TP->Filter.ContextType == CTX_DAVNS) {
 		WebcitHandler *H;
-		H = (WebcitHandler*) CTX;
-		StrBufAppendTemplate(Target, TP, H->Name, 0);
+		H = (WebcitHandler*) CTX(CTX_DAVNS);
+		if (H != NULL)
+			StrBufAppendTemplate(Target, TP, H->Name, 0);
 	}
 	else if (WCC->Hdr->HR.Handler != NULL) {
 		StrBufAppendTemplate(Target, TP, WCC->Hdr->HR.Handler->Name, 0);