diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
| commit | c79c1b391331ab7c8c0f01265a627ffae23d54e2 (patch) | |
| tree | 66d988e77e1af2b8695a9726a76fc7d5743a69a6 /Zotlabs/Lib/PConfig.php | |
| parent | 716a83d1f77e2d6f26b25ab03ffe130c11ef7feb (diff) | |
| parent | b926a4c67e4d7dcba01df91dddcc047abde246bb (diff) | |
| download | volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.gz volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.bz2 volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.zip | |
Merge branch 'dev' into pdo
Diffstat (limited to 'Zotlabs/Lib/PConfig.php')
| -rw-r--r-- | Zotlabs/Lib/PConfig.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php index a481667a5..7e29ef8de 100644 --- a/Zotlabs/Lib/PConfig.php +++ b/Zotlabs/Lib/PConfig.php @@ -185,13 +185,16 @@ class PConfig { $ret = false; - if(array_key_exists($key, \App::$config[$uid][$family])) + if(array_key_exists($uid,\App::$config) + && array_key_exists($family,\App::$config['uid']) + && array_key_exists($key, \App::$config[$uid][$family])) unset(\App::$config[$uid][$family][$key]); - $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'", - intval($uid), - dbesc($family), - dbesc($key) - ); + + $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'", + intval($uid), + dbesc($family), + dbesc($key) + ); return $ret; } |