diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
| commit | 5189a56ef832e1c5c6976f87d77d218bf4a6c221 (patch) | |
| tree | 4c1aa63a36eeaadab00c61eb05f3f9f5ae0da095 /include/conversation.php | |
| parent | 751e4181e5e875b9f9850700a3687774e4c53ab3 (diff) | |
| parent | d81256d7b051d9a76b087feeb64ac79fb4aeff4d (diff) | |
| download | volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.gz volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.bz2 volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 8ca484c9e..5de4fcb51 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -649,7 +649,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { // template to use to render item (wall, walltowall, search) 'template' => $template, - 'type' => implode("",array_slice(split("/",$item['verb']),-1)), + 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), @@ -897,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('File as:'), - '$whereareu' => t('Where are you right now?'), - '$title' => t('Enter a title for this item') + '$whereareu' => t('Where are you right now?') )); |