harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-01-23 23:47:08 -08:00
commit 21f6549204
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -1301,7 +1301,8 @@ function prepare_page($item) {
$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
$observer = $a->get_observer(); $observer = $a->get_observer();
$zid = ($observer['xchan_addr']); $zid = ($observer['xchan_addr']);
$preview = substr(urlencode($item['body']), 0, 100); //240 chars is the longest we can have before we start hitting problems with suhosin sites
$preview = substr(urlencode($item['body']), 0, 240);
$link = z_root() . '/' . $a->cmd; $link = z_root() . '/' . $a->cmd;
if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) { if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) {
if($a->layout['webpage']['authored'] === 'none') if($a->layout['webpage']['authored'] === 'none')
@ -1316,7 +1317,7 @@ function prepare_page($item) {
'$title' => smilies(bbcode($item['title'])), '$title' => smilies(bbcode($item['title'])),
'$body' => prepare_body($item,true), '$body' => prepare_body($item,true),
'$preview' => $preview, '$preview' => $preview,
'$link' => $link '$link' => $link,
)); ));
} }