X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=f4dd01ddeb3363ac502b4a2989b8e47038c0f678;hb=0dce36bdbce7482329105e2c1ef4f3c8b3043803;hp=0c319e802f92418ba01a688b1b5daad524604562;hpb=f3b499f1192a3cc2386aa639d2f0d2fa147e911a;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 0c319e802f..f4dd01ddeb 100644
--- 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'),