diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 2 | ||||
| -rw-r--r-- | mod/editpost.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 17 |
3 files changed, 15 insertions, 5 deletions
diff --git a/mod/channel.php b/mod/channel.php index 022def2a8..b06602994 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -146,7 +146,7 @@ function channel_content(&$a, $update = 0, $load = false) { */ - $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['profile_uid']); if(get_pconfig($a->profile['profile_uid'],'system','channel_list_mode') && (! $mid)) $page_mode = 'list'; diff --git a/mod/editpost.php b/mod/editpost.php index 58ebe31cb..81bb91b2a 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -132,6 +132,7 @@ function editpost_content(&$a) { '$ptyp' => $itm[0]['type'], '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, + '$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''), '$baseurl' => $a->get_baseurl(), '$defloc' => $channel['channel_location'], '$visitor' => false, diff --git a/mod/item.php b/mod/item.php index a732a9f81..cbbaa9e27 100644 --- a/mod/item.php +++ b/mod/item.php @@ -452,8 +452,6 @@ function item_post(&$a) { } } - $post_type = notags(trim($_REQUEST['type'])); - $mimetype = notags(trim($_REQUEST['mimetype'])); if(! $mimetype) $mimetype = 'text/bbcode'; @@ -659,8 +657,19 @@ function item_post(&$a) { $item_unseen = 1; - if($post_type === 'wall' || $post_type === 'wall-comment') - $item_flags = $item_flags | ITEM_WALL; + + // determine if this is a wall post + + if($parent) { + if($parent_item['item_flags'] & ITEM_WALL) { + $item_flags = $item_flags | ITEM_WALL; + } + } + else { + if(! $webpage) { + $item_flags = $item_flags | ITEM_WALL; + } + } if($origin) $item_flags = $item_flags | ITEM_ORIGIN; |