Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7699)
+++ /controller/wpsg_BasketController.class.php	(revision 7700)
@@ -50,5 +50,8 @@
 				
 			}
-			
+
+            $this->shop->checkShippingAvailable();
+            $this->shop->checkPaymentAvailable();
+
 			// Basket aus Session zusammenbauen
 			$this->shop->basket->initFromSession();
@@ -59,7 +62,8 @@
 			$this->shop->view['error'] = array();
 			if (isset($_SESSION['wpsg']['errorFields']) && wpsg_checkInput($_SESSION['wpsg']['errorFields'], WPSG_SANITIZE_ARRAY_TEXTFIELD)) $this->shop->view['error'] = $_SESSION['wpsg']['errorFields'];
-			
-			$this->shop->checkShippingAvailable();
-			$this->shop->checkPaymentAvailable();
+
+			//Im Zoo ging es bei den Zusammengesetzten Versandarten nicht, deshalb verbinde ich es weiter oben schon
+			//$this->shop->checkShippingAvailable();
+			//$this->shop->checkPaymentAvailable();
 			
 			// Sollte es nur eine Versand/Zahlungsart geben, dann diese verwenden
Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 7699)
+++ /controller/wpsg_OrderController.class.php	(revision 7700)
@@ -1338,7 +1338,9 @@
 
             }
-            
+
             $oCalculation = new \wpsg\wpsg_calculation();
             $oCalculation->fromDB($this->shop->view['data']['id']);
+
+            $this->shop->checkShippingAvailable();
 
             $this->shop->view['oCalculation'] = $oCalculation;
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7699)
+++ /controller/wpsg_ShopController.class.php	(revision 7700)
@@ -3277,4 +3277,6 @@
 
             }
+
+			$this->callMods('wp_loaded');
 
 		} // public function wp_load()
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7699)
+++ /lib/wpsg_calculation.class.php	(revision 7700)
@@ -818,6 +818,9 @@
 					            		
 				} else if ($cr['type'] === 'shipping') {
-            		
-            		$db_data['shipping_set'] = wpsg_q($cr['set']);
+
+            	    if (is_array($cr['set'])) $shipping_set = implode('#', $cr['set']);
+            	    else $shipping_set = $cr['set'];
+
+            		$db_data['shipping_set'] = wpsg_q($shipping_set);
 					$db_data['shipping_key'] = wpsg_q($cr['data']['shipping_key']);
 					$db_data['shipping_bruttonetto'] = wpsg_q($cr['bruttonetto']);
@@ -1106,9 +1109,11 @@
             $this->addCountry($db_order['shop_country_id'], $db_order['shop_country_tax'], $db_order['shop_country_tax_a'],$db_order['shop_country_tax_b'], $db_order['shop_country_tax_c'], $db_order['shop_country_tax_d'], true);
 			$this->addCountry($db_order['target_country_id'], $db_order['target_country_tax'], $db_order['target_country_tax_a'],$db_order['target_country_tax_b'], $db_order['target_country_tax_c'], $db_order['target_country_tax_d'], false);
-			
+
+			if (strpos($db_order['shipping_set'], '#') !== false) $db_order['shipping_set'] = explode('#', $db_order['shipping_set']);
+
 			// Versand- und Zahlungsart
             $this->addShipping($db_order['shipping_set'],$db_order['shipping_bruttonetto'],$db_order['shipping_tax_key'],$db_order['shipping_key']);
             $this->addPayment($db_order['payment_set'], $db_order['payment_bruttonetto'], $db_order['payment_tax_key'],$db_order['payment_key']);
-            
+
             // Produkte
             foreach ($db_products as $db_p) {
@@ -1202,5 +1207,5 @@
 				
 			}
-			
+
 			// Shipping 
 			if (isset($_SESSION['wpsg']['checkout']['shipping']) && array_key_exists($_SESSION['wpsg']['checkout']['shipping'], $this->shop->arShipping)) {
Index: /views/produkt/addedit_general.phtml
===================================================================
--- /views/produkt/addedit_general.phtml	(revision 7699)
+++ /views/produkt/addedit_general.phtml	(revision 7700)
@@ -22,5 +22,9 @@
 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
 			<?php } else { ?>
-			<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['lang']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
+			<a href="<?php
+
+                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$_REQUEST['edit_id'].'&wpsg_lang='.$a['lang'], 'wpsg-product-edit-'.$_REQUEST['edit_id']);
+
+			?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
 				<?php } ?>
 				<img src="<?php echo $this->getFlagURL().$a['flag']; ?>" alt="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>" />
Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 7699)
+++ /wpshopgermany.php	(revision 7700)
@@ -185,15 +185,14 @@
 	// Nicht behandelte Exceptions werden hier verarbeitet
 	set_exception_handler(array('\\wpsg\\exceptionhandler', 'exception'));
-	
-	if ($shop->isMultiBlog() && !is_admin() && $shop->get_option('wpsg_multiblog_sessionPath', true) == '1')
-	{
-		
-		global $current_blog; 
-		 
-		session_set_cookie_params(0, $current_blog->path);
-				
-	}
-	
-	if (!session_id()) { session_start(); }
+
+    if ($shop->isMultiBlog() && !is_admin() && $shop->get_option('wpsg_multiblog_sessionPath', true) == '1') {
+
+        global $current_blog;
+
+        session_set_cookie_params(0, $current_blog->path);
+
+    }
+
+    if (!is_admin() && !session_id()) { session_start(); }
 
 	// UPLOADS Dir fÃŒr MultiblogunterstÃŒtzung