From 84c48b55143d9cd6bbacd2b987ea41f2bbae37ca Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 27 Oct 2022 23:08:20 -0700
Subject: [PATCH] Prefixing rename messages with the domain name is just
 confusing and hard to implement

---
 virtual-server-lib-funcs.pl | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/virtual-server-lib-funcs.pl b/virtual-server-lib-funcs.pl
index ca2d9f288..f80a13252 100755
--- a/virtual-server-lib-funcs.pl
+++ b/virtual-server-lib-funcs.pl
@@ -14336,22 +14336,6 @@ sub rename_virtual_server
 push(@doms, @subs, @aliases);
 push(@olddoms, @oldsubs, @oldaliases);
 
-# Setup print functions to include domain name
-&push_all_print();
-if (@doms > 1) {
-	if ($first_print eq \&first_text_print) {
-		$first_print = sub {
-		    print &text('rename_dd', $doing_dom->{'dom'})," : ",
-			(map { &html_tags_to_text(&entities_to_ascii($_)) } @_),"\n";
-		    }
-		}
-	elsif ($first_print eq \&first_html_print) {
-		$first_print = sub {
-		    print &text('rename_dd', $doing_dom->{'dom'})," : ",@_,"<br>\n";
-		    }
-		}
-	}
-
 # Update all features in all domains. Include the mail feature always, as this
 # covers FTP users
 local $doing_dom;	# Has to be local for scoping
@@ -14445,7 +14429,6 @@ sub rename_virtual_server
 		}
 	&$second_print($text{'setup_done'});
 	}
-&pop_all_print();
 
 # Fix backup schedule and key owners
 if (!$oldd{'parent'}) {