aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php4
-rw-r--r--include/salmon.php7
2 files changed, 4 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php
index fbcf20636..c3a0b82d2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3893,6 +3893,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
}
$datarray['parent_mid'] = $parent_mid;
+ $datarray['aid'] = $importer['channel_account_id'];
$datarray['uid'] = $importer['channel_id'];
logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
@@ -3975,6 +3976,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$datarray['parent_mid'] = $item_id;
$datarray['uid'] = $importer['channel_id'];
+ $datarray['aid'] = $importer['channel_account_id'];
if(! link_compare($author['owner_link'],$contact['xchan_url'])) {
logger('consume_feed: Correcting item owner.', LOGGER_DEBUG);
@@ -4050,7 +4052,7 @@ function process_salmon_feed($xml, $importer) {
}
if($is_reply)
- $ret['is_reply'] = true;
+ $ret['parent_mid'] = $parent_mid;
$ret['author'] = array();
diff --git a/include/salmon.php b/include/salmon.php
index e1895ab75..737d1f0d0 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -42,13 +42,8 @@ function get_salmon_key($uri,$keyhash) {
if(count($ret)) {
for($x = 0; $x < count($ret); $x ++) {
if(substr($ret[$x],0,5) === 'data:') {
- if(strstr($ret[$x],','))
- $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
- else
- $ret[$x] = substr($ret[$x],5);
+ $ret[$x] = convert_salmon_key($ret[$x]);
}
- else
- $ret[$x] = fetch_url($ret[$x]);
}
}