aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-02-26 20:41:41 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-02-26 20:41:41 +0000
commitcbc6ca642a15d077e66e5cf9fe89a16521b3e6c4 (patch)
tree1fd6a4d5478bdb7db341594dfbff0014908e76f3 /include
parent792abc3a24d13408d4e31a4137a8173e3039bd8e (diff)
downloadvolse-hubzilla-cbc6ca642a15d077e66e5cf9fe89a16521b3e6c4.tar.gz
volse-hubzilla-cbc6ca642a15d077e66e5cf9fe89a16521b3e6c4.tar.bz2
volse-hubzilla-cbc6ca642a15d077e66e5cf9fe89a16521b3e6c4.zip
1 Bugfix (missing $ character) and avoid some notices
Diffstat (limited to 'include')
-rwxr-xr-xinclude/conversation.php6
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'],