diff options
| author | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
| commit | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (patch) | |
| tree | 9a8ed6282b805732251d254cadef124c90c85727 /include/conversation.php | |
| parent | b79380f906731ed1aa4dfa540dcf297fe253c904 (diff) | |
| parent | 4b1de0f538e6d3f48e2a4d1e82522aced6b08129 (diff) | |
| download | volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.gz volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.bz2 volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.zip | |
Merge pull request #49 from CatoTH/master
Bugfix for del_config
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'], |