aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/PConfig.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2016-07-22 20:16:49 +0200
committerzottel <github@zottel.net>2016-07-22 20:16:49 +0200
commited82cb108f99ce45ced841161fa505ecf11ceee4 (patch)
tree03d75b325963a2ba5eba83045c1d1a042c4862f2 /Zotlabs/Lib/PConfig.php
parent43def0873e6cc4cf535eb8282187757dd84283c2 (diff)
parent4ffc4ee70aa38c24cee2a7ae0b35c9203515acef (diff)
downloadvolse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.gz
volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.bz2
volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Lib/PConfig.php')
-rw-r--r--Zotlabs/Lib/PConfig.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index 195321375..319b8f203 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -17,7 +17,7 @@ class PConfig {
*/
static public function Load($uid) {
- if($uid === false)
+ if(is_null($uid) || $uid === false)
return false;
if(! array_key_exists($uid, \App::$config))
@@ -61,7 +61,7 @@ class PConfig {
static public function Get($uid,$family,$key,$instore = false) {
- if($uid === false)
+ if(is_null($uid) || $uid === false)
return false;
if(! array_key_exists($uid, \App::$config))
@@ -102,7 +102,7 @@ class PConfig {
// we provide a function backtrace in the logs so that we can find
// and fix the calling function.
- if($uid === false) {
+ if(is_null($uid) || $uid === false) {
btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR);
return;
}
@@ -172,6 +172,9 @@ class PConfig {
static public function Delete($uid, $family, $key) {
+ if(is_null($uid) || $uid === false)
+ return false;
+
$ret = false;
if(array_key_exists($key, \App::$config[$uid][$family]))