diff options
| author | Mario <mario@mariovavti.com> | 2024-03-25 16:09:53 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-03-25 16:09:53 +0000 |
| commit | 842df8a7991688ccb0770dcca0119acf728e1c8b (patch) | |
| tree | d06f81878fc3752829f85c1ea1262dd7bd92ade7 | |
| parent | 2ff84ab25a98d26d5e6e941fffff28b463ca3335 (diff) | |
| download | volse-hubzilla-842df8a7991688ccb0770dcca0119acf728e1c8b.tar.gz volse-hubzilla-842df8a7991688ccb0770dcca0119acf728e1c8b.tar.bz2 volse-hubzilla-842df8a7991688ccb0770dcca0119acf728e1c8b.zip | |
add the observer hash to the cache key in categories_widget()
| -rw-r--r-- | Zotlabs/Daemon/Cache_query.php | 5 | ||||
| -rw-r--r-- | include/contact_widgets.php | 7 | ||||
| -rw-r--r-- | include/taxonomy.php | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php index 8e5c6b2ea..d5788795f 100644 --- a/Zotlabs/Daemon/Cache_query.php +++ b/Zotlabs/Daemon/Cache_query.php @@ -12,6 +12,7 @@ class Cache_query { if(! $argc == 3) return; + $r = null; $key = $argv[1]; $pid = Config::Get('procid', $key, false); @@ -29,8 +30,10 @@ class Cache_query { $arr = json_decode(base64_decode($argv[0]), true); $r = call_user_func_array('q', $arr); - if($r) + + if(is_array($r)) { Cache::set($key, serialize($r)); + } Config::Delete('procid', $key); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 43aae4b25..3589653c1 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -2,6 +2,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function findpeople_widget() { @@ -71,7 +72,9 @@ function categories_widget($baseurl,$selected = '') { $item_normal = item_normal(); - $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; + $observer = get_observer_hash(); + + $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); if (! $content) { @@ -97,7 +100,7 @@ function categories_widget($baseurl,$selected = '') { dbesc(ACTIVITY_UPDATE) ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } if (!$content) { diff --git a/include/taxonomy.php b/include/taxonomy.php index 49b364154..45287fa63 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -7,6 +7,7 @@ use Zotlabs\Lib\Cache; use Zotlabs\Lib\Config; +use Zotlabs\Daemon\Master; function file_tag_encode($s) { @@ -358,7 +359,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { } } - $key = __FUNCTION__ . "-" . md5($site . $recent . $safemode . $limit . $type); + $key = __FUNCTION__ . '_' . md5($site . $recent . $safemode . $limit . $type); $content = Cache::get($key, '5 MINUTE'); if(! $content) { @@ -378,7 +379,7 @@ function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { (intval($count) ? "LIMIT $count" : '') ]; - \Zotlabs\Daemon\Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); + Master::Summon([ 'Cache_query', $key, base64_encode(json_encode($arr)) ]); } $r = unserialize($content); |