aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-28 17:43:29 -0700
committerfriendica <info@friendica.com>2012-06-28 17:43:29 -0700
commita3edbf7e5d0d89e99c2249cf30657b1fbc57982a (patch)
tree75d20b8a787b229c0fdbb48861b4a064e35c31fb /include/conversation.php
parent43d3721fa92f21007f45427eea35810a3b8545c6 (diff)
downloadvolse-hubzilla-a3edbf7e5d0d89e99c2249cf30657b1fbc57982a.tar.gz
volse-hubzilla-a3edbf7e5d0d89e99c2249cf30657b1fbc57982a.tar.bz2
volse-hubzilla-a3edbf7e5d0d89e99c2249cf30657b1fbc57982a.zip
create third privacy state - public post but not searchable or publicly visible
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index c2113dead..f2fb2e97b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -427,12 +427,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// We've already parsed out like/dislike for special treatment. We can ignore them now
if(((activity_match($item['verb'],ACTIVITY_LIKE))
- || (activity_match($item['verb'],ACTIVITY_DISLIKE))))
-// && ($item['id'] != $item['parent']))
+ || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
+ && ($item['id'] != $item['parent']))
continue;
$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
- $toplevelprivate = false;
+
// Take care of author collapsing and comment collapsing
// (author collapsing is currently disabled)
@@ -440,7 +440,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// If there are more than two comments, squash all but the last 2.
if($toplevelpost) {
- $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
+
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
$comments_seen = 0;
@@ -485,7 +485,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
- $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
? t('Private Message')
: false);
@@ -546,7 +546,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
$likebuttons = '';
- $shareable = ((($profile_owner == local_user()) && ((! $item['private']) || $item['network'] === NETWORK_FEED)) ? true : false);
+ $shareable = ((($profile_owner == local_user()) && (! $item['private'] == 1)) ? true : false);
if($page_writeable) {
/* if($toplevelpost) { */