Fixed issues from PR python-telegram-bot#1166

mathefreak1 · mathefreak1 · commit 86ff673c09b9 · 2018-07-27T09:55:53.000+02:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -1093,12 +1093,12 @@ def send_contact(self,
                      phone_number=None,
                      first_name=None,
                      last_name=None,
-                     vcard=None,
                      disable_notification=False,
                      reply_to_message_id=None,
                      reply_markup=None,
                      timeout=None,
                      contact=None,
+                     vcard=None,
                      **kwargs):
         """Use this method to send phone contacts.
 
@@ -1143,8 +1143,10 @@ def send_contact(self,
         if isinstance(contact, Contact):
             phone_number = contact.phone_number
             first_name = contact.first_name
-            last_name = contact.last_name
-            vcard = contact.vcard
+            if contact.last_name:
+                last_name = contact.last_name
+            if contact.vcard:
+                vcard = contact.vcard
 
         data = {'chat_id': chat_id, 'phone_number': phone_number, 'first_name': first_name}
 
diff --git a/telegram/inline/inlinequeryresultcontact.py b/telegram/inline/inlinequeryresultcontact.py
@@ -66,12 +66,12 @@ def __init__(self,
                  phone_number,
                  first_name,
                  last_name=None,
-                 vcard=None,
                  reply_markup=None,
                  input_message_content=None,
                  thumb_url=None,
                  thumb_width=None,
                  thumb_height=None,
+                 vcard=None,
                  **kwargs):
         # Required
         super(InlineQueryResultContact, self).__init__('contact', id)
