aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-20 11:58:08 +0000
committerMario <mario@mariovavti.com>2020-04-20 11:58:08 +0000
commit03506bd6cf70719819f35a4979a759a7afee7eab (patch)
tree56635d1c856ff54b97068a7534f447b7816b03bd /Zotlabs
parent244936b0fd3ac60defa9fa6042e6ee3be869721c (diff)
downloadvolse-hubzilla-03506bd6cf70719819f35a4979a759a7afee7eab.tar.gz
volse-hubzilla-03506bd6cf70719819f35a4979a759a7afee7eab.tar.bz2
volse-hubzilla-03506bd6cf70719819f35a4979a759a7afee7eab.zip
use $mid as plink to prevent to long plinks
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Activity.php2
-rw-r--r--Zotlabs/Module/Item.php10
2 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php
index 93b5a15fc..9971ee60f 100644
--- a/Zotlabs/Module/Activity.php
+++ b/Zotlabs/Module/Activity.php
@@ -170,6 +170,8 @@ class Activity extends Controller {
}
+ goaway(z_root() . '/item/' . argv(1));
+
}
}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index aa81c11e7..95359ccad 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -157,8 +157,9 @@ class Item extends Controller {
}
if(argc() > 1 && argv(1) !== 'drop') {
- $x = q("select uid, item_wall, llink, mid from item where mid = '%s' ",
- dbesc(z_root() . '/item/' . argv(1))
+ $x = q("select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' ",
+ dbesc(z_root() . '/item/' . argv(1)),
+ dbesc(z_root() . '/activity/' . argv(1))
);
if($x) {
foreach($x as $xv) {
@@ -955,8 +956,9 @@ class Item extends Controller {
}
if ((! $plink) && ($item_thread_top)) {
- $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . gen_link_id($mid);
- $plink = substr($plink,0,190);
+ // $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . gen_link_id($mid);
+ // $plink = substr($plink,0,190);
+ $plink = $mid;
}
if ($datarray['obj']) {