diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-01-06 09:11:48 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-01-06 09:11:48 +0100 |
| commit | f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872 (patch) | |
| tree | f06c87479be60f3c601cbeed6088e6e74d97785c /include/conversation.php | |
| parent | efe308b5ac9ac7e8d399fb880f31b6967de8fec1 (diff) | |
| parent | c3ada095f4156bba01e77d2d250d5821ba5e859e (diff) | |
| download | volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.tar.gz volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.tar.bz2 volse-hubzilla-f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2803d14e4..4a53060e3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -129,7 +129,7 @@ function localize_item(&$item){ * that are based on unique features of the calling module. * */ -function conversation(&$a, $items, $mode, $update) { +function conversation(&$a, $items, $mode, $update, $preview = false) { require_once('bbcode.php'); @@ -287,7 +287,7 @@ function conversation(&$a, $items, $mode, $update) { '$like' => '', '$dislike' => '', '$comment' => '', - '$conv' => array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context')), + '$conv' => (($preview) ? '' : array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))), '$wait' => t('Please wait'), )); @@ -483,6 +483,7 @@ function conversation(&$a, $items, $mode, $update) { '$myphoto' => $a->contact['thumb'], '$comment' => t('Comment'), '$submit' => t('Submit'), + '$preview' => t('Preview'), '$ww' => (($mode === 'network') ? $commentww : '') )); } |