diff options
| author | Mario <mario@mariovavti.com> | 2020-07-14 09:24:11 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-07-14 09:24:11 +0200 |
| commit | 1c88a8d4a065fb4df81f2d4566a078ac75c670b8 (patch) | |
| tree | e89b9f7cccba05028c97c0c44ea3dcf3f1c1dc94 /Zotlabs | |
| parent | ce77f82966d921e144e84506374875dec8965127 (diff) | |
| parent | c0735a5ca20ea5612d475f50eb802cb1cd92cab5 (diff) | |
| download | volse-hubzilla-1c88a8d4a065fb4df81f2d4566a078ac75c670b8.tar.gz volse-hubzilla-1c88a8d4a065fb4df81f2d4566a078ac75c670b8.tar.bz2 volse-hubzilla-1c88a8d4a065fb4df81f2d4566a078ac75c670b8.zip | |
Merge branch 'dev' into 'dev'
z6 work
See merge request hubzilla/core!1862
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Z6trans.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 426f88688..fadc38b38 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -150,9 +150,11 @@ class ThreadItem { $edpost = false; - if($observer['xchan_hash'] == $this->get_data_value('author_xchan') + if($observer && $observer['xchan_hash'] + && ($observer['xchan_hash'] == $this->get_data_value('author_xchan') || $observer['xchan_hash'] == $this->get_data_value('owner_xchan') - || $this->get_data_value('uid') == local_channel()) + || $observer['xchan_hash'] == $this->get_data_value('source_xchan') + || $this->get_data_value('uid') == local_channel())) $dropping = true; diff --git a/Zotlabs/Module/Z6trans.php b/Zotlabs/Module/Z6trans.php index 98832ad98..58dc09a51 100644 --- a/Zotlabs/Module/Z6trans.php +++ b/Zotlabs/Module/Z6trans.php @@ -119,7 +119,7 @@ class Z6trans extends Controller { 'xconfig' => ['xchan', 'v'], 'xign' => ['xchan'], 'xlink' => ['xlink_xchan', 'xlink_link'], - 'xprof' => ['xprof_hash'], +// 'xprof' => ['xprof_hash'], 'xtag' => ['xtag_hash'], ]; |