Index: /changelog
===================================================================
--- /changelog	(revision 8363)
+++ /changelog	(revision 8364)
@@ -601,4 +601,5 @@
 - Bugfix: Modul PayPal Plus: Gutscheinwert und Versandkosten werden wieder bei PP berechnet
 - Bugfix: Korrektes Lieferland bei Besteuerung aus Lieferland
+- Bugfix: PayPal PLus ÌbertrÀgt Adresse nur wenn im Shop gefunden (Lieferanschrift)
 - Feature: Modul Vorkasse: QR-Code ist nun deaktivierbar
 - Feature: Modul Vorkasse: QR-Rechnung ist nun an BestellbestÀtigung (E-Mail) anhÀngbar
Index: /mods/wpsg_mod_paypalapi.class.php
===================================================================
--- /mods/wpsg_mod_paypalapi.class.php	(revision 8363)
+++ /mods/wpsg_mod_paypalapi.class.php	(revision 8364)
@@ -944,17 +944,22 @@
 			    if (wpsg_isSizedArray($shipping)) {
 
-                    $_SESSION['wpsg']['checkout']['diff_shippingadress'] = '1';
-
-                    // [full_name] => Herr Sebastian Szewernoha
-                    
-				    $arName = wpsg_explodeName($shipping['name']['full_name']); 
-
-                    $_SESSION['wpsg']['checkout']['shipping_vname'] = wpsg_getStr($arName[0]);
-                    $_SESSION['wpsg']['checkout']['shipping_name'] = wpsg_getStr($arName[1]);
-
-                    $_SESSION['wpsg']['checkout']['shipping_strasse'] = wpsg_getStr($shipping['address']['address_line_1']);
-                    $_SESSION['wpsg']['checkout']['shipping_plz'] = wpsg_getStr($shipping['address']['postal_code']);
-                    $_SESSION['wpsg']['checkout']['shipping_ort'] = wpsg_getStr($shipping['address']['admin_area_2']);
-                    $_SESSION['wpsg']['checkout']['shipping_land'] = $this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper(wpsg_getStr($shipping['address']['country_code'])))."'");
+                    $country_id = intval($this->db->fetchOne("SELECT `id` FROM `".WPSG_TBL_LAND."` WHERE UPPER(`kuerzel`) = '".wpsg_q(strtoupper(wpsg_getStr($shipping['address']['country_code'])))."'"));
+
+					if ($country_id > 0) {
+						
+						$_SESSION['wpsg']['checkout']['diff_shippingadress'] = '1';
+						
+						$arName = wpsg_explodeName($shipping['name']['full_name']);
+						
+						$_SESSION['wpsg']['checkout']['shipping_vname'] = wpsg_getStr($arName[0]);
+						$_SESSION['wpsg']['checkout']['shipping_name'] = wpsg_getStr($arName[1]);
+						
+						$_SESSION['wpsg']['checkout']['shipping_strasse'] = wpsg_getStr($shipping['address']['address_line_1']);
+						$_SESSION['wpsg']['checkout']['shipping_plz'] = wpsg_getStr($shipping['address']['postal_code']);
+						$_SESSION['wpsg']['checkout']['shipping_ort'] = wpsg_getStr($shipping['address']['admin_area_2']);
+						
+						$_SESSION['wpsg']['checkout']['shipping_land'] = $country_id;
+						
+					}
 
                 }