diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:45:55 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:45:55 +0000 |
| commit | 958b5d623ecc89fb2dde4155f56358860e855f32 (patch) | |
| tree | 43e1ba59a81b8101ec82a4916acdc5f8c0d6da56 | |
| parent | b1a02cf450c92e88f3375d15b153d0046bc5c724 (diff) | |
| parent | 1fc38311f9b99d3ceed910a74f7e169032c633c4 (diff) | |
| download | volse-hubzilla-958b5d623ecc89fb2dde4155f56358860e855f32.tar.gz volse-hubzilla-958b5d623ecc89fb2dde4155f56358860e855f32.tar.bz2 volse-hubzilla-958b5d623ecc89fb2dde4155f56358860e855f32.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | mod/item.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/item.php b/mod/item.php index b91563f45..0a2c34128 100644 --- a/mod/item.php +++ b/mod/item.php @@ -57,7 +57,7 @@ function item_post(&$a) { // If you are unsure, it is prudent (and important) to leave it unset. $origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1); - + $owner_hash = null; $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); @@ -266,6 +266,7 @@ function item_post(&$a) { $str_group_allow = $parent_item['allow_gid']; $str_contact_deny = $parent_item['deny_cid']; $str_group_deny = $parent_item['deny_gid']; + $owner_hash = $parent_item['owner_xchan']; } if(! strlen($body)) { @@ -518,7 +519,7 @@ function item_post(&$a) { $datarray['aid'] = $channel['channel_account_id']; $datarray['uid'] = $profile_uid; - $datarray['owner_xchan'] = $owner_xchan['xchan_hash']; + $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); $datarray['author_xchan'] = $observer['xchan_hash']; $datarray['created'] = datetime_convert(); $datarray['edited'] = datetime_convert(); |