aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2014-04-18 16:34:48 +0100
committerThomas Willingham <founder@kakste.com>2014-04-18 16:34:48 +0100
commit4e0b85267aae6aa8c982b56eb7c17ca2dae17f17 (patch)
treeec6479b8bf68a9049541168b9b3c0493a03b6a4b
parent59eb3b3351ca38851248aa4b3b072e160dc9555b (diff)
downloadvolse-hubzilla-4e0b85267aae6aa8c982b56eb7c17ca2dae17f17.tar.gz
volse-hubzilla-4e0b85267aae6aa8c982b56eb7c17ca2dae17f17.tar.bz2
volse-hubzilla-4e0b85267aae6aa8c982b56eb7c17ca2dae17f17.zip
We know why third party zids didn't work now, so don't use hacky
workarounds anymore.
-rw-r--r--include/conversation.php5
-rwxr-xr-xview/tpl/page_display.tpl2
2 files changed, 2 insertions, 5 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),
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 9b6b182c8..d8175bdd2 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -2,7 +2,7 @@
<div class="generic-content-wrapper" id="page-content-wrapper" >
<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-body">{{$body}}</div>
</div>