Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7316)
+++ /controller/wpsg_ShopController.class.php	(revision 7317)
@@ -3461,5 +3461,5 @@
 				
 				$arTitle = explode('|', $arPflicht['anrede_auswahl']);
-				$arReplace['/%kunde_anrede%/i'] = __($arTitle[$kunden_data['title']], 'wpsg');
+				$arReplace['/%kunde_anrede%/i'] = __(wpsg_getStr($arTitle[$kunden_data['title']]), 'wpsg');
 
 			}
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7316)
+++ /lib/wpsg_calculation.class.php	(revision 7317)
@@ -717,5 +717,5 @@
 				if (!wpsg_isSizedInt($p['order_product_id']) && $p['product_index'] !== false) {
 					
-					$p['order_product_id'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($id)."' AND `p_id` = '".wpsg_q($p['product_id'])."' ");
+					$p['order_product_id'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($id)."' AND `p_id` = '".wpsg_q($p['product_id'])."' AND `productkey` = '".wpsg_q($p['productkey'])."' AND `product_index` = '".wpsg_q($p['product_index'])."' ");
 					
 				}
Index: /views/mods/mod_paypalapi/paypalplus.phtml
===================================================================
--- /views/mods/mod_paypalapi/paypalplus.phtml	(revision 7316)
+++ /views/mods/mod_paypalapi/paypalplus.phtml	(revision 7317)
@@ -29,5 +29,5 @@
 		},
 		<?php } ?>
-		<?php if ($this->view['wpsg_order_done'] !== true) { ?>
+		<?php if (@$this->view['wpsg_order_done'] !== true) { ?>
 		"onLoad": function() { if (typeof wpsg_mod_paypalapi_load == 'function') wpsg_mod_paypalapi_load(); }, 
 		"buttonLocation": "outside",
Index: /views/mods/mod_trustedshops/checkout_customer_inner.phtml
===================================================================
--- /views/mods/mod_trustedshops/checkout_customer_inner.phtml	(revision 7316)
+++ /views/mods/mod_trustedshops/checkout_customer_inner.phtml	(revision 7317)
@@ -8,5 +8,5 @@
 <div class="wpsg_checkoutblock">
 	<label for="wpsg_mod_trustedshops_set">
-		<input class="wpsg_checkout" type="checkbox" id="wpsg_mod_trustedshops_set" name="wpsg[checkout][wpsg_mod_trustedshops_set]" value="1" <?php echo (($this->view['basket']['checkout']['wpsg_mod_trustedshops_set'] == '1' || ($this->get_option('wpsg_mod_trustedshops_customerset_preset') == '1' && !isset($this->view['basket']['checkout']['wpsg_mod_trustedshops_set'])))?'checked="checked"':''); ?> /><?php echo __('Ich bin damit einverstanden, eine separate und unverbindliche Bewertungsaufforderung (<a href="https://www.trustedshops.com/" target="_blank">Trusted Shops</a>) per Mail zu erhalten.', 'wpsg'); ?>						
+		<input class="wpsg_checkout" type="checkbox" id="wpsg_mod_trustedshops_set" name="wpsg[checkout][wpsg_mod_trustedshops_set]" value="1" <?php echo ((wpsg_isSizedInt($this->view['basket']['checkout']['wpsg_mod_trustedshops_set']) || ($this->get_option('wpsg_mod_trustedshops_customerset_preset') == '1' && !isset($this->view['basket']['checkout']['wpsg_mod_trustedshops_set'])))?'checked="checked"':''); ?> /><?php echo __('Ich bin damit einverstanden, eine separate und unverbindliche Bewertungsaufforderung (<a href="https://www.trustedshops.com/" target="_blank">Trusted Shops</a>) per Mail zu erhalten.', 'wpsg'); ?>						
 	</label>
 </div>