diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 23:04:07 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 23:05:31 -0700 |
| commit | 824dedbe9d349c5b6d92d1d950267299bc134cc3 (patch) | |
| tree | 0756aff488584c4e4f08915fb98ef3c4ce1852f4 | |
| parent | 8f57bb95fe78f70c40f45ad3c7df92ab1e8cb305 (diff) | |
| download | volse-hubzilla-824dedbe9d349c5b6d92d1d950267299bc134cc3.tar.gz volse-hubzilla-824dedbe9d349c5b6d92d1d950267299bc134cc3.tar.bz2 volse-hubzilla-824dedbe9d349c5b6d92d1d950267299bc134cc3.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 235c5528e..b54099d74 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 00ecef07d..889b50eb1 100644 --- a/include/import.php +++ b/include/import.php @@ -1004,7 +1004,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']; |