diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.php | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/include/config.php b/include/config.php index 1f7a4dbd7..38840f5e4 100644 --- a/include/config.php +++ b/include/config.php @@ -130,20 +130,12 @@ function load_pconfig($uid,$family = '') { if(! array_key_exists($uid,$a->config)) $a->config[$uid] = array(); - if(($family) && (! array_key_exists($family,$a->config[$uid]))) - $a->config[$uid][$family] = array(); - if($family) { - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - } - else { - $r = q("SELECT * FROM `pconfig` WHERE `uid` = %d", - intval($uid) - ); - } + // family is no longer used - load entire user config + + $r = q("SELECT * FROM `pconfig` WHERE `uid` = %d", + intval($uid) + ); if($r) { foreach($r as $rr) { @@ -266,20 +258,12 @@ function load_xconfig($xchan,$family = '') { if(! array_key_exists($xchan,$a->config)) $a->config[$xchan] = array(); - if(($family) && (! array_key_exists($family,$a->config[$xchan]))) - $a->config[$xchan][$family] = array(); - if($family) { - $r = q("SELECT * FROM `xconfig` WHERE `cat` = '%s' AND `xchan` = '%s'", - dbesc($family), - dbesc($xchan) - ); - } - else { - $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'", - dbesc($xchan) - ); - } + // family is no longer used. Entire config is loaded + + $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'", + dbesc($xchan) + ); if($r) { foreach($r as $rr) { |