diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-02 17:31:25 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-02 17:31:25 +0100 |
| commit | 9fcc2a18dfb042eca619d338ed6615bff3784be5 (patch) | |
| tree | d02cdea385de99975d27c43ca555e57942ba2ee5 /include/config.php | |
| parent | b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d (diff) | |
| parent | e83419b53e27078867f8449f476d87b064b9d502 (diff) | |
| download | volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.tar.gz volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.tar.bz2 volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/config.php')
| -rw-r--r-- | include/config.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/config.php b/include/config.php index bccf0737f..8d98d56fa 100644 --- a/include/config.php +++ b/include/config.php @@ -65,7 +65,7 @@ function get_config($family, $key) { if(! array_key_exists($key,$a->config[$family])) { return false; } - return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) + return ((! is_array($a->config[$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) ? unserialize($a->config[$family][$key]) : $a->config[$family][$key] ); @@ -174,8 +174,8 @@ function get_pconfig($uid,$family, $key, $instore = false) { if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family]))) return false; - - return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) + + return ((! is_array($a->config[$uid][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) ? unserialize($a->config[$uid][$family][$key]) : $a->config[$uid][$family][$key] ); @@ -304,7 +304,7 @@ function get_xconfig($xchan,$family, $key) { if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family]))) return false; - return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) + return ((! is_array($a->config[$xchan][$family][$key])) && (preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) ? unserialize($a->config[$xchan][$family][$key]) : $a->config[$xchan][$family][$key] ); |