aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-12-17 09:49:10 +0100
committerMario Vavti <mario@mariovavti.com>2017-12-17 09:49:10 +0100
commit78146d6417245d1d679816b4cd2b3f3274c2a225 (patch)
tree984ac104b3e92c5cb0cbf6ce930330c7b181fa23
parent7181cf901242c75fed84920817466aff650b6848 (diff)
parent59779f2a0e397984fdf0174818969c76a3639272 (diff)
downloadvolse-hubzilla-78146d6417245d1d679816b4cd2b3f3274c2a225.tar.gz
volse-hubzilla-78146d6417245d1d679816b4cd2b3f3274c2a225.tar.bz2
volse-hubzilla-78146d6417245d1d679816b4cd2b3f3274c2a225.zip
merge red master into dev
-rw-r--r--include/text.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index f3d522e04..107efe0cb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1754,9 +1754,14 @@ function get_plink($item,$conversation_mode = true) {
else
$key = 'llink';
+ $zidify = true;
+
+ if(array_key_exists('author',$item) && $item['author']['xchan_network'] !== 'zot')
+ $zidify = false;
+
if(x($item,$key)) {
return array(
- 'href' => zid($item[$key]),
+ 'href' => (($zidify) ? zid($item[$key]) : $item[$key]),
'title' => t('Link to Source'),
);
}