diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connedit.php | 1 | ||||
| -rwxr-xr-x | mod/subthread.php | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 198a66b56..61bb62766 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -482,6 +482,7 @@ function connedit_content(&$a) { '$them' => t('Their Settings'), '$me' => t('My Settings'), '$perms' => $perms, + '$clear' => t('Clear/Disable Automatic Permissions'), '$forum' => t('Forum Members'), '$soapbox' => t('Soapbox'), '$full' => t('Full Sharing (typical social network permissions)'), diff --git a/mod/subthread.php b/mod/subthread.php index 11b7236fb..a9d18621c 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -37,15 +37,15 @@ function subthread_content(&$a) { $remote_owner = null; - if(! $item['wall']) { + if(! ($item['item_flags'] & ITEM_WALL)) { // The top level post may have been written by somebody on another system - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item['contact-id']), + $r = q("SELECT * FROM abook WHERE abook_xchan = '%s' AND uid = %d LIMIT 1", + intval($item['author_xchan']), intval($item['uid']) ); - if(! count($r)) + if(! $r) return; - if(! $r[0]['self']) + if(! ($r[0]['abook_flags'] & ABOOK_FLAG_SELF)) $remote_owner = $r[0]; } |