harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make mail replies work

Browse Source
This commit is contained in:
friendica 2012-12-05 17:11:38 -08:00
parent 1c6f301d8f
commit 270266357d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/items.php
View File

@ -1630,6 +1630,11 @@ function mail_store($arr) {
$arr['mail_flags'] = ((x($arr,'mail_flags')) ? intval($arr['mail_flags']) : 0 ); $arr['mail_flags'] = ((x($arr,'mail_flags')) ? intval($arr['mail_flags']) : 0 );
if(! $arr['parent_uri']) {
logger('mail_store: missing parent');
$arr['parent_uri'] = $arr['uri'];
}
$r = q("SELECT `id` FROM mail WHERE `uri` = '%s' AND channel_id = %d LIMIT 1", $r = q("SELECT `id` FROM mail WHERE `uri` = '%s' AND channel_id = %d LIMIT 1",
dbesc($arr['uri']), dbesc($arr['uri']),
intval($arr['channel_id']) intval($arr['channel_id'])

2
mod/message.php
View File

@ -437,7 +437,7 @@ logger('message: ' . print_r($message,true));
logger('mails: ' . print_r($mails,true)); logger('mails: ' . print_r($mails,true));
$recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to_xchan' : 'from_xchan'); $recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from');
$select = $message[$recp]['xchan_name'] . '<input type="hidden" name="messageto" value="' . $message[$recp]['xchan_hash'] . '" />'; $select = $message[$recp]['xchan_name'] . '<input type="hidden" name="messageto" value="' . $message[$recp]['xchan_hash'] . '" />';
$parent = '<input type="hidden" name="replyto" value="' . $message['parent_uri'] . '" />'; $parent = '<input type="hidden" name="replyto" value="' . $message['parent_uri'] . '" />';