oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-09 08:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing #10699 (prohibits blocking and ignoreing from the photo menu)

Browse source
This commit is contained in:
Philipp 2021-09-12 21:20:12 +02:00
parent 5246b9c4b0
commit a65fbcebe7
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Object/Thread.php
View file

@ -190,12 +190,13 @@ class Thread
* We should find a way to avoid using those arguments (at least most of them)
*
* @param array $conv_responses data
* @param string $formSecurityToken A security Token to avoid CSF attacks
*
* @return mixed The data requested on success
* false on failure
* @throws \Exception
*/
public function getTemplateData($conv_responses)
public function getTemplateData($conv_responses, string $formSecurityToken)
{
$result = [];
@ -204,7 +205,7 @@ class Thread
continue;
}
$item_data = $item->getTemplateData($conv_responses);
$item_data = $item->getTemplateData($conv_responses, $formSecurityToken);
if (!$item_data) {
Logger::log('[ERROR] Conversation::getTemplateData : Failed to get item template data ('. $item->getId() .').', Logger::DEBUG);