aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-09-08 09:22:36 +0200
committerMario Vavti <mario@mariovavti.com>2017-09-08 09:22:36 +0200
commit108bb7649bb61bee65d9923c9080c3af8e715bc4 (patch)
tree4b96649d85d098de8e723df85b409cb0a43832d1 /include/text.php
parent7b3aa92b5ad09c0820db2b20bc462c975f0d3aba (diff)
parent1104e2652f15aaa405208b6dec9e439fb8c39537 (diff)
downloadvolse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.gz
volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.bz2
volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index a3c2bbc08..51d711021 100644
--- a/include/text.php
+++ b/include/text.php
@@ -987,7 +987,7 @@ function chanlink_cid($d) {
function magiclink_url($observer,$myaddr,$url) {
return (($observer)
- ? z_root() . '/magic?f=&dest=' . $url . '&addr=' . $myaddr
+ ? z_root() . '/magic?f=&owa=1&dest=' . $url . '&addr=' . $myaddr
: $url
);
}
@@ -1389,7 +1389,7 @@ function theme_attachments(&$item) {
if(is_foreigner($item['author_xchan']))
$url = $r['href'];
else
- $url = z_root() . '/magic?f=&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
+ $url = z_root() . '/magic?f=&owa=1&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
//$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink" >' . $icon . '</a>';
$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);