Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7763)
+++ /controller/wpsg_BasketController.class.php	(revision 7764)
@@ -9,5 +9,5 @@
 		
 		public function content_filter(&$content) {
-			
+
 			if (wpsg_get_the_id() === $this->shop->getPagePID(wpsg_ShopController::PAGE_BASKET)) {
 				
@@ -173,5 +173,5 @@
 		 */
 		public function checkoutAction(&$content) {
-			
+
 			$this->setBasketData();
 			
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7763)
+++ /controller/wpsg_ShopController.class.php	(revision 7764)
@@ -756,4 +756,6 @@
             }
 
+            $this->initShop();
+
             $locale = apply_filters('plugin_locale', get_locale(), 'wpsg');
             
@@ -782,5 +784,9 @@
         public function send_headers() {
 
+            $ses = $_SESSION;
+
             session_start();
+
+            $_SESSION = $ses;
 
         }
@@ -824,5 +830,5 @@
 		 * Ich hab das nicht in den Konstruktor gepackt, damit einige Funktionen aus der initShop Methode schon auf das $GLOBALS zugreifen kÔÞΩnnen
 		 */
-		public function initShop($prefix)
+		public function initShop()
 		{
 		    
@@ -844,19 +850,16 @@
 			if (wpsg_isSizedInt($this->get_option('wpsg_autolineending'))) @ini_set('auto_detect_line_endings', true);
 
-			$this->prefix = $prefix;
 			$this->basket = new wpsg_basket();
 
-			if ($this->get_option('wpsg_installed', true) > 0)
-			{
+			if ($this->get_option('wpsg_installed', true) > 0) {
 
 				$this->loadModule();
 
 				// Hier mÃŒssen die Änderungen der Session gespeichert werden
-				if (wpsg_isSizedArray($_REQUEST['wpsg']['checkout']))
-				{
+				if (wpsg_isSizedArray($_REQUEST['wpsg']['checkout'])) {
 
 					$_SESSION['wpsg']['checkout'] = wpsg_xss(
 						wpsg_array_merge(
-							(array)$_SESSION['wpsg']['checkout'],
+							wpsg_getArray($_SESSION['wpsg']['checkout']),
 							wpsg_trim($_REQUEST['wpsg']['checkout'], false)
 						)
Index: /wpshopgermany.php
===================================================================
--- /wpshopgermany.php	(revision 7763)
+++ /wpshopgermany.php	(revision 7764)
@@ -218,6 +218,8 @@
 	}
 
-	$shop->initShop($prefix);
-	 
+	//Wird jetzt im init Hook aufgerufen
+	//$shop->initShop($prefix);
+    $shop->prefix = $prefix;
+
 	// Standardrollen fÃŒr die Rechteverteilung 
 	$role_object = get_role('administrator');