bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

maintain backward compatibility with old PMs

Browse source
This commit is contained in:
friendica 2011-12-05 14:06:41 -08:00
parent c8d5274cee
commit adbc84c48e
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1185' ); define ( 'FRIENDICA_VERSION', '2.3.1186' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1109 ); define ( 'DB_UPDATE_VERSION', 1109 );

28
include/message.php
View file

@ -27,9 +27,27 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$hash = random_string(); $hash = random_string();
$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ; $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
if(! strlen($replyto)) { $convid = 0;
// look for any existing conversation structure
if(strlen($replyto)) {
$r = q("select convid from mail where uid = %d and uri = '%s' limit 1",
intval(local_user()),
dbesc($replyto)
);
if(count($r))
$convid = $r[0]['convid'];
}
if(! strlen($replyto))
$replyto = $uri; $replyto = $uri;
if(! $convid) {
// create a new conversation
$conv_guid = get_guid(); $conv_guid = get_guid();
$recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3); $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
@ -52,14 +70,6 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
if(count($r)) if(count($r))
$convid = $r[0]['id']; $convid = $r[0]['id'];
} }
else {
$r = q("select convid from mail where uid = %d and uri = '%s' limit 1",
intval(local_user()),
dbesc($replyto)
);
if(count($r))
$convid = $r[0]['convid'];
}
if(! $convid) { if(! $convid) {
logger('send message: conversation not found.'); logger('send message: conversation not found.');