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

We know why third party zids didn't work now, so don't use hacky

Browse Source 
workarounds anymore.
This commit is contained in:
Thomas Willingham 2014-04-18 16:34:48 +01:00
parent 59eb3b3351
commit 4e0b85267a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -1303,11 +1303,9 @@ function render_location_default($item) {
function prepare_page($item) { function prepare_page($item) {
$a = get_app(); $a = get_app();
$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']);
//240 chars is the longest we can have before we start hitting problems with suhosin sites //240 chars is the longest we can have before we start hitting problems with suhosin sites
$preview = substr(urlencode($item['body']), 0, 240); $preview = substr(urlencode($item['body']), 0, 240);
$link = z_root() . '/' . $a->cmd; $link = z_root() . '/' . $a->cmd;
@ -1318,8 +1316,7 @@ function prepare_page($item) {
} }
return replace_macros(get_markup_template('page_display.tpl'),array( return replace_macros(get_markup_template('page_display.tpl'),array(
'$author' => (($naked) ? '' : $item['author']['xchan_name']), '$author' => (($naked) ? '' : $item['author']['xchan_name']),
'$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), '$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])),
'$zid' => $zid,
'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),
'$title' => smilies(bbcode($item['title'])), '$title' => smilies(bbcode($item['title'])),
'$body' => prepare_body($item,true), '$body' => prepare_body($item,true),

2
view/tpl/page_display.tpl
View File

@ -2,7 +2,7 @@
<div class="generic-content-wrapper" id="page-content-wrapper" > <div class="generic-content-wrapper" id="page-content-wrapper" >
<h3 class="page-title">{{$title}}</h3> <h3 class="page-title">{{$title}}</h3>
<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div> <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
<div class="page-date">{{$date}}</div> <div class="page-date">{{$date}}</div>
<div class="page-body">{{$body}}</div> <div class="page-body">{{$body}}</div>
</div> </div>