Index: /changelog
===================================================================
--- /changelog	(revision 7829)
+++ /changelog	(revision 7830)
@@ -426,2 +426,3 @@
 - Feature: parallele Erstellung eines Dokumentes ohne Vorlage (Briefbogenfunktion)
 - Bugfix: Anzeige von Name/Titel in den Passwort Vergessen Mails
+- Bugfix: KundenzusammenfÃŒgen funktioniert wieder
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7829)
+++ /controller/wpsg_ShopController.class.php	(revision 7830)
@@ -3348,4 +3348,5 @@
             }
 
+			$this->callMods('load');
 			$this->callMods('wp_loaded');
 
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7829)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7830)
@@ -257,29 +257,22 @@
 		} // public function wpsg_add_pages()
 
-		public function load() 
-		{ 
+		public function load()  {
 
 			require_once(dirname(__FILE__).'/mod_kundenverwaltung/wpsg_kundenverwaltung_widget.class.php');
 			add_action('widgets_init', function() { return register_widget("wpsg_kundenverwaltung_widget"); } );
-			
-            if (is_admin())
-            {
-
-                if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && !wpsg_isSizedArray($_REQUEST['customer']))
-                {
+
+            if (is_admin()) {
+
+                if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && !wpsg_isSizedArray($_REQUEST['customer'])) {
 
                     $this->shop->addBackendError(__('Bitte mindestens einen Kunden wÀhlen.', 'wpsg'));
                     $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer');
                     
-                }
-                else if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && isset($_REQUEST['submit_do']) && !wpsg_isSizedInt($_REQUEST['set_target']))
-                {
+                } else if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && isset($_REQUEST['submit_do']) && !wpsg_isSizedInt($_REQUEST['set_target'])) {
                     
                     $this->shop->addBackendError(__('Kein Zielkunde ausgewÀhlt.', 'wpsg'));
                     unset($_REQUEST['submit_do']);
                     
-                }
-                else if (isset($_REQUEST['submit_do']))
-                {
+                } else if (isset($_REQUEST['submit_do'])) {
 
                     // Hier die Kunden zusammenfÃŒhren, damit ich umleiten kann
Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 7829)
+++ /wpshopgermany.php	(revision 7830)
@@ -290,24 +290,2 @@
 
     add_action('send_headers', [$shop, 'send_headers'], 0);
-
-	$shop->callMods('load', array());
-	
-	/*
-	add_action('template_redirect', function() {
-		
-		if (($_REQUEST['m_id']??'') == '601' && isset($_REQUEST['file']) && isset($GLOBALS['wpsg_sc'])) {
-			
-			$encoded_file = base64_decode($_REQUEST['file']);
-			
-			if ($encoded_file !== false) {
-				
-				$url = get_permalink(wpsg_ShopController::getShop()->get_option('wpsg_page_basket'))."&plugin=1&noheader=1&m_id=".$this->id."&order=".$_REQUEST['order_id']."&file=".rawurlencode($encoded_file)."&produkt=".$_REQUEST['produkt']."&chash=".$_REQUEST['chash']."\r\n\r\n";
-				
-				header('Redirect: '.$url);	
-				exit;
-				
-			}
-			
-		}
-		
-	}, 9); */