Merge remote-tracking branch 'friendica/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 0c319e802f92418ba01a688b1b5daad524604562..f4dd01ddeb3363ac502b4a2989b8e47038c0f678 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -294,7 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
                                $arr = array('item' => $item, 'output' => $tmp_item);
                                call_hooks('display_item', $arr);
 
-                               $threads[$threadsid]['id'] = $arr[$item['item_id']];
+                               $threads[$threadsid]['id'] = $item['item_id'];
                                $threads[$threadsid]['html'] .= $arr['output'];
 
                        }
@@ -856,12 +856,19 @@ function status_editor($a,$x, $notes_cid = 0) {
                        '$action' => 'item',
                        '$share' => (($x['button']) ? $x['button'] : t('Share')),
                        '$upload' => t('Upload photo'),
+                       '$shortupload' => t('upload photo'),
                        '$attach' => t('Attach file'),
+                       '$shortattach' => t('attach file'),
                        '$weblink' => t('Insert web link'),
+                       '$shortweblink' => t('web link'),
                        '$video' => t('Insert video link'),
+                       '$shortvideo' => t('video link'),
                        '$audio' => t('Insert audio link'),
+                       '$shortaudio' => t('audio link'),
                        '$setloc' => t('Set your location'),
+                       '$shortsetloc' => t('set location'),
                        '$noloc' => t('Clear browser location'),
+                       '$shortnoloc' => t('clear location'),
                        '$title' => "",
                        '$placeholdertitle' => t('Set title'),
                        '$wait' => t('Please wait'),