merge red master into dev

2017-12-17 09:49:10 +01:00 · 2017-12-17 09:49:10 +01:00 · 78146d6417
commit 78146d6417
parent 7181cf9012 59779f2a0e
1 changed files with 6 additions and 1 deletions
--- 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'),
 		);
 	}