diff options
| author | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-27 00:03:51 +0100 |
| commit | 18679111f5aed8f1c5e7ccb9857195e52c57765d (patch) | |
| tree | bffb4a563ed2fe1ff02a4221e28c608460c866db /include/conversation.php | |
| parent | fe3dfbee5638dd2988bd8b126652b3138572f02c (diff) | |
| parent | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (diff) | |
| download | volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.gz volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.tar.bz2 volse-hubzilla-18679111f5aed8f1c5e7ccb9857195e52c57765d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 3d13a1179..53369cf20 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -232,7 +232,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $alike = array(); $dlike = array(); - + $o = ""; // array with html for each thread (parent+comments) $threads = array(); @@ -436,7 +436,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } else { // prevent private email from leaking into public conversation - if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user())) + if((! $toplevelpost) && (! $toplevelprivate) && ($item['private']) && ($profile_owner != local_user())) continue; $comments_seen ++; } @@ -641,7 +641,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $body = prepare_body($item,true); $tmp_item = replace_macros($template,array( - '$type' => implode("",array_slice(split("/",$item['verb']),-1)), + '$type' => implode("",array_slice(explode("/",$item['verb']),-1)), '$tags' => $tags, '$body' => template_escape($body), '$id' => $item['item_id'], |