Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7854)
+++ /lib/wpsg_basket.class.php	(revision 7855)
@@ -1289,9 +1289,14 @@
 			
 				$land = $this->shop->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->arCheckout['land'])."'");
-			
-				if ($land['mwst'] == '1' || $this->shop->get_option('wpsg_kleinunternehmer') == '1') $noMwSt = true;
-				else if ($land['mwst'] == '2' && wpsg_isSizedString($this->arCheckout['ustidnr'])) $noMwSt = true;
-				else $noMwSt = false;
-				
+
+				$noMwSt = false;
+
+				if (wpsg_isSizedArray($land)) {
+
+					if ($land['mwst'] == '1' || $this->shop->get_option('wpsg_kleinunternehmer') == '1') $noMwSt = true;
+					else if ($land['mwst'] == '2' && wpsg_isSizedString($this->arCheckout['ustidnr'])) $noMwSt = true;
+
+				}
+
 			}
 			
Index: /model/wpsg_country.class.php
===================================================================
--- /model/wpsg_country.class.php	(revision 7854)
+++ /model/wpsg_country.class.php	(revision 7855)
@@ -11,6 +11,5 @@
 		 * LÀdt die Daten eines Landes
 		 */
-		public function load($country_id)
-		{
+		public function load($country_id) {
 			
 			parent::load($country_id);
@@ -18,6 +17,5 @@
 			$this->data = $this->db->fetchRow("SELECT L.* FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($country_id)."' ");
 			
-			if ($this->data['id'] != $country_id || !wpsg_isSizedInt($this->data['id']))
-			{
+			if (!wpsg_isSizedArray($this->data) || $this->data['id'] != $country_id || !wpsg_isSizedInt($this->data['id'])) {
 				
 				return false;
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7854)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 7855)
@@ -2197,5 +2197,5 @@
 			");
 			 
-			if ($kunde['id'] != $kunde_id) return;
+			if (!wpsg_isSizedArray($kunde) || $kunde['id'] != $kunde_id) return;
             
             $this->db->UpdateQuery(WPSG_TBL_KU, ['last_login' => 'NOW()'], " `id` = '".wpsg_q($kunde['id'])."' ");
Index: /mods/wpsg_mod_productgroups.class.php
===================================================================
--- /mods/wpsg_mod_productgroups.class.php	(revision 7854)
+++ /mods/wpsg_mod_productgroups.class.php	(revision 7855)
@@ -202,11 +202,11 @@
 		 * Integriert den Namen der Gruppe in das Produktarray
 		 */
-		public function loadProduktArray(&$arrProdukt)
-		{
+		public function loadProduktArray(&$arrProdukt) {
 
 			$arrGrp = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS_GROUP."` WHERE `id` = '".wpsg_q($arrProdukt['pgruppe'])."'");
 
-			if ($this->shop->isOtherLang())
-			{
+			if (!wpsg_isSizedArray($arrGrp)) return;
+
+			if ($this->shop->isOtherLang()) {
 
 				$lang = @unserialize($arrGrp['lang']);
Index: /mods/wpsg_mod_produktartikel.class.php
===================================================================
--- /mods/wpsg_mod_produktartikel.class.php	(revision 7854)
+++ /mods/wpsg_mod_produktartikel.class.php	(revision 7855)
@@ -790,6 +790,5 @@
         } // public function renderProdukt_templateSelect(&$produkt_data, &$template_file)
     
-        public function loadProduktArray(&$produkt_data)
-        {
+        public function loadProduktArray(&$produkt_data) {
     
             global $wpdb;
@@ -798,28 +797,29 @@
     
             $post_data = $this->db->fetchRow("
-                    SELECT
-                        `id`, `menu_order`, `comment_status`
-                    FROM
-                        `".$this->shop->prefix."posts`
-                    WHERE
-                        `wpsg_produkt_id` = '".wpsg_q($product_id)."' AND
-                        `post_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."'
-                ");
+                SELECT
+                    `id`, `menu_order`, `comment_status`
+                FROM
+                    `".$this->shop->prefix."posts`
+                WHERE
+                    `wpsg_produkt_id` = '".wpsg_q($product_id)."' AND
+                    `post_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."'
+            ");
+
+            if (!wpsg_isSizedArray($post_data)) return;
     
             $post_id = $post_data['id'];
     
             $arCat = $this->db->fetchOne("
-                    SELECT
-                        GROUP_CONCAT(DISTINCT `term_taxonomy_id`)
-                    FROM
-                        ".$this->shop->prefix."term_relationships
-                    WHERE
-                        `object_id` = '".wpsg_q($post_id)."'
-                ");
+                SELECT
+                    GROUP_CONCAT(DISTINCT `term_taxonomy_id`)
+                FROM
+                    ".$this->shop->prefix."term_relationships
+                WHERE
+                    `object_id` = '".wpsg_q($post_id)."'
+            ");
     
             $permalink = get_permalink($post_id);
     
-            if (wpsg_isSizedInt($post_id) && wpsg_isSizedString($permalink))
-            {
+            if (wpsg_isSizedInt($post_id) && wpsg_isSizedString($permalink)) {
     
                 if ($this->shop->get_option('wpsg_mod_produktartikel_comment') === '1') $comment_status = 'open';
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css	(revision 7854)
+++ /views/css/frontend.css	(revision 7855)
@@ -126,5 +126,4 @@
 .wpsg_overview .wpsg_agb { width:100%; clear:both; margin-bottom:2px; }
 .wpsg_overview .wpsg_agb label { line-height:18px; }
-.wpsg_overview .wpsg_agb input[type="checkbox"] { width:auto; /*margin-top:10px; margin-right:10px;*/ }
 .wpsg_overview .shippayment { margin-top:1rem; float:right; width:45%; }
 .wpsg_overview .anschrift { margin-top:1rem; float:left; width:55%; }
Index: /views/produkt/index.phtml
===================================================================
--- /views/produkt/index.phtml	(revision 7854)
+++ /views/produkt/index.phtml	(revision 7855)
@@ -210,5 +210,5 @@
                             <a href="<?php
 
-                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$d['id'].'&wpsg_lang='.$l['lang'], 'wpsg-product-edit-'.$d['id']);
+                                echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$d['id'], 'wpsg-product-edit-'.$d['id']);
 							
 							?>" title="<?php echo wpsg_translate(__('Produkt fÃŒr Sprache #1# bearbeiten.', 'wpsg'), $d['name']) ?>">