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 /Zotlabs | |
| 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 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cache_query.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 2 |
2 files changed, 5 insertions, 2 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/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index b62f268d3..a68fdcf26 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -3,7 +3,7 @@ namespace Zotlabs\Storage; use Sabre\DAV; -use Zotlabz\Lib\Config; +use Zotlabs\Lib\Config; use Zotlabs\Lib\Libsync; /** |