X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fupgrade%2Fserv_upgrade.c;h=d4cd4904b81f380c3c62ffaa22d14972e5bbd94c;hb=5b75c8be92aec760921c1723d8dde74a3f63b1da;hp=6526999275cd19827fbd1e0e3f9e8bb6afcf192c;hpb=a80f9ae62e7c9a29d7dd768a73b145f8fce763a5;p=citadel.git

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 652699927..d4cd4904b 100644
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -432,9 +432,7 @@ void check_server_upgrades(void) {
 	syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
 
 	if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
-		syslog(LOG_WARNING,
-			"Server hosted updates need to be processed at this time.  Please wait..."
-		);
+		syslog(LOG_WARNING, "Server hosted updates need to be processed at this time.  Please wait...");
 	}
 	else {
 		return;
@@ -500,7 +498,6 @@ void check_server_upgrades(void) {
 CTDL_MODULE_UPGRADE(upgrade)
 {
 	check_server_upgrades();
-	ingest_old_roominfo_and_roompic_files();	// FIXME remove this line, it's proper above!!!!
 	
 	/* return our module id for the Log */
 	return "upgrade";