aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Display.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-27 04:00:10 -0700
committerredmatrix <git@macgirvin.com>2016-06-27 04:00:10 -0700
commit85d2ad4aea106417dc3d8ce2429d13dd858c5201 (patch)
tree72e03b3fe379829a4e2f9c521366fb14e1eaa970 /Zotlabs/Module/Display.php
parentd5d5d78e3aded9a3238ccb7e93b4c6fd4b873331 (diff)
parent8d298d5a068845856c9827c0d2ea3f02f1399d72 (diff)
downloadvolse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.gz
volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.tar.bz2
volse-hubzilla-85d2ad4aea106417dc3d8ce2429d13dd858c5201.zip
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Display.php')
-rw-r--r--Zotlabs/Module/Display.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index c1a0d84bc..d1d4edc7d 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -106,12 +106,13 @@ class Display extends \Zotlabs\Web\Controller {
$x = q("select * from channel where channel_id = %d limit 1",
intval($target_item['uid'])
);
- $y = q("select * from item_id where uid = %d and service = 'WEBPAGE' and iid = %d limit 1",
+ $y = q("select * from iconfig left join item on iconfig.iid = item.id
+ where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
intval($target_item['uid']),
intval($target_item['id'])
);
if($x && $y) {
- goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['sid']);
+ goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
}
else {
notice( t('Page not found.') . EOL);