1 Bugfix (missing $ character) and avoid some notices
This commit is contained in:
parent
792abc3a24
commit
cbc6ca642a
|
@ -232,7 +232,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
$alike = array();
|
$alike = array();
|
||||||
$dlike = array();
|
$dlike = array();
|
||||||
|
$o = "";
|
||||||
|
|
||||||
// array with html for each thread (parent+comments)
|
// array with html for each thread (parent+comments)
|
||||||
$threads = array();
|
$threads = array();
|
||||||
|
@ -436,7 +436,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// prevent private email from leaking into public conversation
|
// 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;
|
continue;
|
||||||
$comments_seen ++;
|
$comments_seen ++;
|
||||||
}
|
}
|
||||||
|
@ -641,7 +641,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$body = prepare_body($item,true);
|
$body = prepare_body($item,true);
|
||||||
|
|
||||||
$tmp_item = replace_macros($template,array(
|
$tmp_item = replace_macros($template,array(
|
||||||
'$type' => implode("",array_slice(split("/",$item['verb']),-1)),
|
'$type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
||||||
'$tags' => $tags,
|
'$tags' => $tags,
|
||||||
'$body' => template_escape($body),
|
'$body' => template_escape($body),
|
||||||
'$id' => $item['item_id'],
|
'$id' => $item['item_id'],
|
||||||
|
|
Loading…
Reference in a new issue