diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-23 08:11:35 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-23 08:11:35 +0530 |
| commit | 6e4760dd9c512147309b5e4a98d25216610f81da (patch) | |
| tree | cd1ea2edf6b257e52ab8fd10c781ba600d884506 /include/config.php | |
| parent | 11974b4d948ae5d9b9fb53970838463bd88bb9f6 (diff) | |
| parent | 4e7eb36dd1e65bf481ffe30614565674cbef4fe5 (diff) | |
| download | volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.tar.gz volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.tar.bz2 volse-hubzilla-6e4760dd9c512147309b5e4a98d25216610f81da.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/config.php')
| -rw-r--r-- | include/config.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/config.php b/include/config.php index df1070c13..1f2a70e5a 100644 --- a/include/config.php +++ b/include/config.php @@ -18,19 +18,17 @@ if(! function_exists('load_config')) { function load_config($family) { global $a; - $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", - dbesc($family) - ); + $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", dbesc($family)); if(count($r)) { foreach($r as $rr) { $k = $rr['k']; - if ($rr['cat'] === 'config') { + if ($family === 'config') { $a->config[$k] = $rr['v']; } else { $a->config[$family][$k] = $rr['v']; } } - } else if ($rr['cat'] != 'config') { + } else if ($family != 'config') { // Negative caching $a->config[$family] = "!<unset>!"; } @@ -128,7 +126,7 @@ function load_pconfig($uid,$family) { $k = $rr['k']; $a->config[$uid][$family][$k] = $rr['v']; } - } else if ($rr['cat'] != 'config') { + } else if ($family != 'config') { // Negative caching $a->config[$uid][$family] = "!<unset>!"; } |