harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "merge""

Browse Source 
This reverts commit 9294f72adb.
This commit is contained in:
Christian Vogeley
2013-08-03 00:18:14 +02:00
parent 9294f72adb
commit f09ac4e597
119 changed files with 1506 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/config.php
View File

@@ -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) {