X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fuseredit.c;h=ef1be72b6b50b7fd2653ef25249fff7963f8bfe7;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=d6d3a41ec2bbfcd783b3dbffe3befe1c6ee6fa34;hpb=23f67881c0c0de5092ea849c5469b8601ce31ee4;p=citadel.git

diff --git a/webcit/useredit.c b/webcit/useredit.c
index d6d3a41ec..ef1be72b6 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -481,6 +481,7 @@ int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP)
 	StrBuf *Buf;
 	const char *who;
 	long len;
+	int r = 0;
 
 	GetTemplateTokenString(Target, TP, 2, &who, &len);
 
@@ -488,15 +489,16 @@ int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP)
 	serv_printf("OIMG _userpic_|%s", who);
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		serv_puts("CLOS");
-		StrBuf_ServGetln(Buf);
-		GetServerStatus(Buf, NULL);
-		FreeStrBuf(&Buf);
-		return 1;
-	} else {
-		FreeStrBuf(&Buf);
-		return 0;
+		r = 1;
 	}
+	else {
+		r = 0;
+	}
+	serv_puts("CLOS");
+	StrBuf_ServGetln(Buf);
+	GetServerStatus(Buf, NULL);
+	FreeStrBuf(&Buf);
+	return(r);
 }
 
 
@@ -529,7 +531,7 @@ TRYAGAIN:
 	Stat.lowest_found = (-1);
 	Stat.highest_found = (-1);
 	/* Search for the user's vCard */
-	if (load_msg_ptrs("MSGS ALL||||1", &Stat, NULL) > 0) {
+	if (load_msg_ptrs("MSGS ALL||||1", NULL, &Stat, NULL) > 0) {
 		at = GetNewHashPos(WCC->summ, 0);
 		while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
 			Msg = (message_summary*) vMsg;