make it the default

This commit is contained in:
friendica 2014-09-24 02:18:13 -07:00
parent 95470a9f9b
commit c76b8febaa

View File

@ -1581,28 +1581,27 @@ function get_atom_elements($feed,$item,&$author) {
$res['body'] = escape_tags($res['body']); $res['body'] = escape_tags($res['body']);
} }
if(get_config('system','feedlinks')) { if($res['plink'] && $res['title']) {
if($res['plink'] && $res['title']) { $res['body'] = '#^[url=' . $res['plink'] . ']' . $res['title'] . '[/url]' . "\n\n" . $res['body'];
$res['body'] = '#^[url=' . $res['plink'] . ']' . $res['title'] . '[/url]' . "\n\n" . $res['body']; $terms = array();
$terms = array(); $terms[] = array(
$terms[] = array( 'otype' => TERM_OBJ_POST,
'otype' => TERM_OBJ_POST, 'type' => TERM_BOOKMARK,
'type' => TERM_BOOKMARK, 'url' => $res['plink'],
'url' => $res['plink'], 'term' => $res['title'],
'term' => $res['title'], );
);
}
elseif($res['plink']) {
$res['body'] = '#^[url]' . $res['plink'] . '[/url]' . "\n\n" . $res['body'];
$terms = array();
$terms[] = array(
'otype' => TERM_OBJ_POST,
'type' => TERM_BOOKMARK,
'url' => $res['plink'],
'term' => $res['plink'],
);
}
} }
elseif($res['plink']) {
$res['body'] = '#^[url]' . $res['plink'] . '[/url]' . "\n\n" . $res['body'];
$terms = array();
$terms[] = array(
'otype' => TERM_OBJ_POST,
'type' => TERM_BOOKMARK,
'url' => $res['plink'],
'term' => $res['plink'],
);
}
$private = $item->get_item_tags(NAMESPACE_DFRN,'private'); $private = $item->get_item_tags(NAMESPACE_DFRN,'private');
if($private && intval($private[0]['data']) > 0) if($private && intval($private[0]['data']) > 0)