strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Browse source 
Conflicts:
	include/conversation.php
This commit is contained in:
Domovoy 2012-08-05 13:43:53 +02:00
commit e247915f48
21 changed files with 72 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -514,6 +514,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '')
));
}
@ -1132,7 +1133,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
'$mobileapp' => t('Friendica mobile web'),
'$sourceapp' => t($a->sourcename),
));