diff options
| author | friendica <info@friendica.com> | 2014-04-18 16:14:13 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-18 16:14:13 -0700 |
| commit | b886647429c6b2f65e1a515adc5b2b739df63c27 (patch) | |
| tree | 5244b287928de79afa3ab454945fb5a2deaef8ec /include/conversation.php | |
| parent | ae1f9bf1c44cffa00b8aff566eef0f22bc26e720 (diff) | |
| parent | fdcb6052fca2a430bec31d31baa9781eba77b7cb (diff) | |
| download | volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.tar.gz volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.tar.bz2 volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php index 541da1d9b..2d72f3489 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1303,11 +1303,9 @@ function render_location_default($item) { function prepare_page($item) { - $a = get_app(); $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); $observer = $a->get_observer(); - $zid = ($observer['xchan_addr']); //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; @@ -1318,8 +1316,7 @@ function prepare_page($item) { } return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), - '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), - '$zid' => $zid, + '$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])), '$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), |