aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-22 22:15:30 -0800
committerfriendica <info@friendica.com>2014-01-22 22:15:30 -0800
commit79c287916ff4263cf4aaaca5695cdf8ce67bb2b7 (patch)
treee743e0e521bef7d7b4839a17bd787a40b687124f /include/conversation.php
parent66baa3cab0537a5a2f1a4aad54526b35987da90d (diff)
parente4bce90b538d59ba108a1c054a7691f6d4bef15a (diff)
downloadvolse-hubzilla-79c287916ff4263cf4aaaca5695cdf8ce67bb2b7.tar.gz
volse-hubzilla-79c287916ff4263cf4aaaca5695cdf8ce67bb2b7.tar.bz2
volse-hubzilla-79c287916ff4263cf4aaaca5695cdf8ce67bb2b7.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 708348ddd..46a01d3c9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1301,7 +1301,8 @@ function prepare_page($item) {
$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
$observer = $a->get_observer();
$zid = ($observer['xchan_addr']);
-
+ $preview = substr(urlencode($item['body']), 0, 100);
+ $link = z_root() . '/' . $a->cmd;
if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) {
if($a->layout['webpage']['authored'] === 'none')
$naked = 1;
@@ -1313,7 +1314,9 @@ function prepare_page($item) {
'$zid' => $zid,
'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),
'$title' => smilies(bbcode($item['title'])),
- '$body' => prepare_body($item,true)
+ '$body' => prepare_body($item,true),
+ '$preview' => $preview,
+ '$link' => $link
));
}
@@ -1374,26 +1377,26 @@ function network_tabs() {
$tabs = array(
array(
'label' => t('Commented Order'),
- 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+ 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
'sel'=>$all_active,
'title'=> t('Sort by Comment Date'),
),
array(
'label' => t('Posted Order'),
- 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
+ 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
'sel'=>$postord_active,
'title' => t('Sort by Post Date'),
),
array(
'label' => t('Personal'),
- 'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
+ 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1',
'sel' => $conv_active,
'title' => t('Posts that mention or involve you'),
),
array(
'label' => t('New'),
- 'url' => $a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&new=1',
+ 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),
'sel' => $new_active,
'title' => t('Activity Stream - by date'),
),