Merge pull request #10717 from nupplaphil/bug/drone_missing_bin

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index bcdebf28d135f829e042c16ad5c7529928e36517..ceb2b6757c3fd2329a28ec898af6e98b462b4762 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -365,6 +365,14 @@ class Contact extends BaseModule
                                throw new NotFoundException(DI::l10n()->t('Contact not found'));
                        }
 
+                       if ($cmd === 'posts') {
+                               return self::getPostsHTML($a, $contact_id);
+                       }
+
+                       if ($cmd === 'conversations') {
+                               return self::getConversationsHMTL($a, $contact_id, $update);
+                       }
+
                        self::checkFormSecurityTokenRedirectOnError('contact/' . $contact_id, 'contact_action', 't');
 
                        $cdata = Model\Contact::getPublicAndUserContactID($orig_record['id'], local_user());
@@ -424,7 +432,8 @@ class Contact extends BaseModule
                                                '$message' => DI::l10n()->t('Do you really want to delete this contact?'),
                                                '$confirm' => DI::l10n()->t('Yes'),
                                                '$confirm_url' => DI::args()->getCommand(),
-                                               '$confirm_name' => 'confirmed',
+                                               '$confirm_name' => 't',
+                                               '$confirm_value' => BaseModule::getFormSecurityToken('contact_action'),
                                                '$cancel' => DI::l10n()->t('Cancel'),
                                        ]);
                                }
@@ -440,12 +449,6 @@ class Contact extends BaseModule
                                DI::baseUrl()->redirect('contact');
                                // NOTREACHED
                        }
-                       if ($cmd === 'posts') {
-                               return self::getPostsHTML($a, $contact_id);
-                       }
-                       if ($cmd === 'conversations') {
-                               return self::getConversationsHMTL($a, $contact_id, $update);
-                       }
                }
 
                $_SESSION['return_path'] = DI::args()->getQueryString();