diff options
| author | Mario <mario@mariovavti.com> | 2024-03-25 21:43:15 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-03-25 21:43:15 +0100 |
| commit | 26a7cef0d87c2b1e910d3aa1cfcfdbff9ebd16e3 (patch) | |
| tree | 310be9acdb5d08d2ada6f3fc3b6cdb413ae12534 /include | |
| parent | 53354a19304c932beea484e387d2c9536786e258 (diff) | |
| parent | c052b7fa9982e82fa25fe0e84ee3462da30ac157 (diff) | |
| download | volse-hubzilla-26a7cef0d87c2b1e910d3aa1cfcfdbff9ebd16e3.tar.gz volse-hubzilla-26a7cef0d87c2b1e910d3aa1cfcfdbff9ebd16e3.tar.bz2 volse-hubzilla-26a7cef0d87c2b1e910d3aa1cfcfdbff9ebd16e3.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/contact_widgets.php | 8 | ||||
| -rw-r--r-- | include/taxonomy.php | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 43aae4b25..84f688d36 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() { @@ -67,11 +68,12 @@ function categories_widget($baseurl,$selected = '') { require_once('include/security.php'); - $sql_extra = item_permissions_sql(App::$profile['profile_uid']); + $observer = get_observer_hash(); + $sql_extra = item_permissions_sql(App::$profile['profile_uid'], $observer); $item_normal = item_normal(); - $key = __FUNCTION__ . "-" . App::$profile['profile_uid']; + $key = __FUNCTION__ . '_' . md5(App::$profile['profile_uid'] . $observer); $content = Cache::get($key, '5 MINUTE'); if (! $content) { @@ -97,7 +99,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); |