diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
| commit | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (patch) | |
| tree | c86f59fcca3a84413d77c325be433c4c5ea862e2 /Zotlabs/Module/Display.php | |
| parent | 98484f0def82493ff9d45405dadefd141a1b32ba (diff) | |
| parent | 47fc0c79588d55a207dc39ae8062ec55382e2564 (diff) | |
| download | volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.gz volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.bz2 volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 5 |
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); |