aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-22 23:49:12 -0700
committerfriendica <info@friendica.com>2014-09-22 23:49:12 -0700
commit72ec78d0270ecc5036e02db984b0a5c5fd293c8b (patch)
tree738453307f5b12cd9bf0b9c94caadae01af3edc8 /include
parente8854bb19dae01b18d2eb13af76d277847bdbb5a (diff)
downloadvolse-hubzilla-72ec78d0270ecc5036e02db984b0a5c5fd293c8b.tar.gz
volse-hubzilla-72ec78d0270ecc5036e02db984b0a5c5fd293c8b.tar.bz2
volse-hubzilla-72ec78d0270ecc5036e02db984b0a5c5fd293c8b.zip
trying to call mod/magic on rss resources - which have no hub
Diffstat (limited to 'include')
-rw-r--r--include/ConversationObject.php8
-rw-r--r--include/text.php6
2 files changed, 9 insertions, 5 deletions
diff --git a/include/ConversationObject.php b/include/ConversationObject.php
index c0fc376ae..a02ba102f 100644
--- a/include/ConversationObject.php
+++ b/include/ConversationObject.php
@@ -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;
diff --git a/include/text.php b/include/text.php
index 573af4d32..22cf17866 100644
--- a/include/text.php
+++ b/include/text.php
@@ -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 );