diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 23:04:07 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 23:04:07 -0700 |
| commit | da707736a075e8f050458316edfcf0177aef0bfc (patch) | |
| tree | 6f4adc41a64c8b112b780a1392e942e07226675b | |
| parent | 0c3543ac43d552dbaee597df41c8b7ea2d650e04 (diff) | |
| download | volse-hubzilla-da707736a075e8f050458316edfcf0177aef0bfc.tar.gz volse-hubzilla-da707736a075e8f050458316edfcf0177aef0bfc.tar.bz2 volse-hubzilla-da707736a075e8f050458316edfcf0177aef0bfc.zip | |
issue #453 and a bug noted from the logfiles related to the schema change last month
| -rw-r--r-- | Zotlabs/Module/Item.php | 4 | ||||
| -rw-r--r-- | include/import.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index f0cb82286..2d0c1ba02 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -183,7 +183,9 @@ class Item extends \Zotlabs\Web\Controller { } // can_comment_on_post() needs info from the following xchan_query - xchan_query($r); + // This may be from the discover tab which means we need to correct the effective uid + + xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel())); $parent_item = $r[0]; $parent = $r[0]['id']; diff --git a/include/import.php b/include/import.php index e4f5ba5a7..42c902a0a 100644 --- a/include/import.php +++ b/include/import.php @@ -1033,7 +1033,7 @@ function sync_files($channel,$files) { $attach_id = $x[0]['id']; } - $newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['data']); + $newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']); unset($att['id']); $att['aid'] = $channel['channel_account_id']; |