aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-15 20:01:55 -0700
committerfriendica <info@friendica.com>2012-08-15 20:01:55 -0700
commit2358a220baad2f8dc027d9bd3cd01c34ae234968 (patch)
tree84f66d0bfb3c48d6f8409111c0b2216b5ea26eb7
parent2a49460c7766d5868115689155e3b9595e5f36a2 (diff)
downloadvolse-hubzilla-2358a220baad2f8dc027d9bd3cd01c34ae234968.tar.gz
volse-hubzilla-2358a220baad2f8dc027d9bd3cd01c34ae234968.tar.bz2
volse-hubzilla-2358a220baad2f8dc027d9bd3cd01c34ae234968.zip
merge from upstream
-rw-r--r--include/enotify.php4
-rwxr-xr-xinclude/items.php9
-rw-r--r--include/text.php3
-rw-r--r--mod/item.php1
-rw-r--r--version.inc2
5 files changed, 13 insertions, 6 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 510991476..b2d7b7b19 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -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)",
diff --git a/include/items.php b/include/items.php
index 9c72d5359..928cf3160 100755
--- a/include/items.php
+++ b/include/items.php
@@ -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
));
diff --git a/include/text.php b/include/text.php
index f6c403388..d49b2269c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -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));
+
}}
diff --git a/mod/item.php b/mod/item.php
index 757506bc4..e2fa5d06b 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -780,6 +780,7 @@ function item_post(&$a) {
'verb' => ACTIVITY_POST,
'otype' => 'item',
'parent' => $parent,
+ 'parent_uri' => $parent_item['uri']
));
}
diff --git a/version.inc b/version.inc
index ecc830b90..0392ed2d1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-08-13.45
+2012-08-15.47