aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-17 01:49:17 +0100
committerzottel <github@zottel.net>2012-03-17 01:49:17 +0100
commitc56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (patch)
treec4574eae6f2aaf68c50ccc1022944e0e1c45760b /include/items.php
parentea4c806c5c3adacb6ef585de657e5f34c2e24c98 (diff)
parent8af36b92bb3a78235f5741c764d034dc66b959b2 (diff)
downloadvolse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.gz
volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.bz2
volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index 68acb45f9..5e1fec557 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2026,6 +2026,7 @@ function local_delivery($importer,$data) {
if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item['object'],false);
$xt = parse_xml_string($item['target'],false);
+
if($xt->type === ACTIVITY_OBJ_NOTE) {
$i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
dbesc($xt->id),