aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-11 05:41:14 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-11 05:41:14 -0700
commit89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd (patch)
tree598928300196120d90a28aac79e57d213dd61779 /include/items.php
parent328ed8bb1b5f73626a032091a78609aea312f5ae (diff)
parentbde8c6d39e1ccf7a53569cc652a62b5447d3243f (diff)
downloadvolse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.tar.gz
volse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.tar.bz2
volse-hubzilla-89faf23aacaaabf07ccf9a6c7b8f0af5b1e581bd.zip
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index a930a7c3e..c4ae948b8 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2072,6 +2072,7 @@ function item_store($arr,$allow_exec = false) {
return $ret;
}
+
// is the new message multi-level threaded?
// even though we don't support it now, preserve the info
// and re-attach to the conversation parent.
@@ -2414,7 +2415,7 @@ function item_store_update($arr,$allow_exec = false) {
$arr['commented'] = $orig[0]['commented'];
$arr['received'] = datetime_convert();
$arr['changed'] = datetime_convert();
-
+ $arr['route'] = ((array_key_exists('route',$arr)) ? trim($arr['route']) : $orig[0]['route']);
$arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : $orig[0]['diaspora_meta']);
$arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : $orig[0]['location']);
$arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : $orig[0]['coord']);