X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=37649cc4c63f3918d5a8ebd78ae6c7e17cc97ec7;hb=e612033104c17c8adcad19d7dc8efbafa8b33f2e;hp=fcb1bdb759d0b1fe1e121c350f96356dd0ac8239;hpb=9c1131c7db367a29550b7abd9642579ec27276e8;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index fcb1bdb75..37649cc4c 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -753,23 +753,19 @@ int purge_user(char pname[])
 	cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 
 	/* remove the user's bio file */
-	snprintf(filename, sizeof filename, 
-#ifndef HAVE_DATA_DIR
-			 "."
-#else
-			 DATA_DIR
-#endif
-			 "/bio/%ld", usbuf.usernum);
+	snprintf(filename, 
+			 sizeof filename, 
+			 "%s/%ld",
+			 ctdl_bio_dir,
+			 usbuf.usernum);
 	unlink(filename);
 
 	/* remove the user's picture */
-	snprintf(filename, sizeof filename, 
-#ifndef HAVE_DATA_DIR
-			 "."
-#else
-			 DATA_DIR
-#endif
-			 "/userpics/%ld.gif", usbuf.usernum);
+	snprintf(filename, 
+			 sizeof filename, 
+			 "%s/%ld.gif",
+			 ctdl_image_dir,
+			 usbuf.usernum);
 	unlink(filename);
 
 	return (0);