From 24d256e253a2a16391e9a5771d2b5bc9578b951d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 4 Dec 2017 21:18:10 -0800 Subject: fix mod display and others that require a non-zero profile_uid for updates --- Zotlabs/Module/Display.php | 7 +++---- Zotlabs/Module/Update.php | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 266a5b6bf..6d895feb5 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -14,6 +14,7 @@ class Display extends \Zotlabs\Web\Controller { $module_format = 'html'; + if(argc() > 1) { $module_format = substr(argv(1),strrpos(argv(1),'.') + 1); if(! in_array($module_format,['atom','zot','json'])) @@ -30,7 +31,7 @@ class Display extends \Zotlabs\Web\Controller { return; } - if(argc() > 1 && argv(1) !== 'load') { + if(argc() > 1) { $item_hash = argv(1); if($module_format !== 'html') { $item_hash = substr($item_hash,0,strrpos($item_hash,'.')); @@ -260,7 +261,7 @@ class Display extends \Zotlabs\Web\Controller { elseif($update && !$load) { $r = null; - + require_once('include/channel.php'); $sys = get_sys_channel(); $sysid = $sys['channel_id']; @@ -285,7 +286,6 @@ class Display extends \Zotlabs\Web\Controller { // make that content unsearchable by ensuring the owner_xchan can't match if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; - $r = q("SELECT item.parent AS item_id from item WHERE parent_mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' @@ -315,7 +315,6 @@ class Display extends \Zotlabs\Web\Controller { WHERE parent in ( %s ) $item_normal ", dbesc($parents_str) ); - xchan_query($items); $items = fetch_post_tags($items,true); $items = conv_sort($items,'created'); diff --git a/Zotlabs/Module/Update.php b/Zotlabs/Module/Update.php index e7470363b..98137c4c2 100644 --- a/Zotlabs/Module/Update.php +++ b/Zotlabs/Module/Update.php @@ -8,6 +8,9 @@ class Update extends \Zotlabs\Web\Controller { $profile_uid = intval($_GET['p']); + if((! $profile_uid) && in_array(argv(1),['display','search','pubstream','home'])) + $profile_uid = (-1); + if(argc() < 2) { killme(); } @@ -24,6 +27,9 @@ class Update extends \Zotlabs\Web\Controller { header("Content-type: text/html"); + \App::$argv = [ argv(1) ]; + \App::$argc = 1; + echo "

\r\n"; echo $mod->get($profile_uid, $load); echo "

\r\n"; -- cgit v1.2.3