mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:35:12 +00:00
merge from upstream
This commit is contained in:
parent
2a49460c77
commit
2358a220ba
5 changed files with 13 additions and 6 deletions
|
@ -1,5 +1,7 @@
|
|||
<?php
|
||||
|
||||
require_once('include/email.php');
|
||||
|
||||
function notification($params) {
|
||||
|
||||
logger('notification: entry', LOGGER_DEBUG);
|
||||
|
@ -324,7 +326,7 @@ function notification($params) {
|
|||
// If so, create the record of it and use a message-id smtp header.
|
||||
|
||||
if(!$r) {
|
||||
logger("norify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " .
|
||||
logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " .
|
||||
intval($params['uid']), LOGGER_DEBUG);
|
||||
$r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
|
||||
values(%d,%d,%d,%d)",
|
||||
|
|
|
@ -2717,12 +2717,14 @@ function local_delivery($importer,$data) {
|
|||
$parent = 0;
|
||||
|
||||
if($posted_id) {
|
||||
$r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
$r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($posted_id),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
if(count($r))
|
||||
if(count($r)) {
|
||||
$parent = $r[0]['parent'];
|
||||
$parent_uri = $r[0]['parent-uri'];
|
||||
}
|
||||
|
||||
if(! $is_like) {
|
||||
$r1 = q("UPDATE `item` SET `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
|
||||
|
@ -2762,7 +2764,7 @@ function local_delivery($importer,$data) {
|
|||
'verb' => ACTIVITY_POST,
|
||||
'otype' => 'item',
|
||||
'parent' => $parent,
|
||||
|
||||
'parent_uri' => $parent_uri,
|
||||
));
|
||||
|
||||
}
|
||||
|
@ -2894,6 +2896,7 @@ function local_delivery($importer,$data) {
|
|||
'verb' => ACTIVITY_POST,
|
||||
'otype' => 'item',
|
||||
'parent' => $conv_parent,
|
||||
'parent_uri' => $parent_uri
|
||||
|
||||
));
|
||||
|
||||
|
|
|
@ -70,7 +70,8 @@ function notags($string) {
|
|||
if(! function_exists('escape_tags')) {
|
||||
function escape_tags($string) {
|
||||
|
||||
return(htmlspecialchars($string));
|
||||
return(htmlspecialchars($string, ENT_QUOTES, 'UTF-8', false));
|
||||
|
||||
}}
|
||||
|
||||
|
||||
|
|
|
@ -780,6 +780,7 @@ function item_post(&$a) {
|
|||
'verb' => ACTIVITY_POST,
|
||||
'otype' => 'item',
|
||||
'parent' => $parent,
|
||||
'parent_uri' => $parent_item['uri']
|
||||
));
|
||||
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
2012-08-13.45
|
||||
2012-08-15.47
|
||||
|
|
Loading…
Reference in a new issue