aboutsummaryrefslogtreecommitdiffstats
path: root/include/config.php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:04:26 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:04:26 +0200
commitc0cd147a3a9a86b270ea32026089ced16fb2f50c (patch)
tree77232d70031622a162f4e00aec128961ecc7a764 /include/config.php
parentd2d1e54bfe928fe4cdfdcfc7e9acf658cda76898 (diff)
parent1d816ba90ad3408822dc64f294597273fd19bc57 (diff)
downloadvolse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.tar.gz
volse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.tar.bz2
volse-hubzilla-c0cd147a3a9a86b270ea32026089ced16fb2f50c.zip
merge
Diffstat (limited to 'include/config.php')
-rw-r--r--include/config.php36
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) {