Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trying to call mod/magic on rss resources - which have no hub

Browse source
This commit is contained in:
friendica 2014-09-22 23:49:12 -07:00
parent e8854bb19d
commit 72ec78d027
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/ConversationObject.php
View file

@ -177,11 +177,11 @@ class Conversation extends BaseObject {
}
}
require_once('include/identity.php');
$sys = get_sys_channel();
// $sys = get_sys_channel();
if($sys && $item->get_data_value('uid') == $sys['channel_id']) {
$item->set_commentable(false);
}
// if($sys && $item->get_data_value('uid') == $sys['channel_id']) {
// $item->set_commentable(false);
// }
$item->set_conversation($this);
$this->threads[] = $item;

6
include/text.php
View file

@ -1183,7 +1183,11 @@ function theme_attachments(&$item) {
$title = t('unknown.???');
$title .= ' ' . $r['length'] . ' ' . t('bytes');
$url = z_root() . '/magic?f=&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
require_once('include/identity.php');
if(is_foreigner($item['author_xchan']))
$url = $r['href'];
else
$url = z_root() . '/magic?f=&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>';
$attaches[] = array('title' => $title, 'url' => $url, 'icon' => $icon );