diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-26 11:02:30 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-26 11:02:30 -0800 |
| commit | d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5 (patch) | |
| tree | 0dd876ff9767998ec13c73cab2ff02f5cbce371a /include/config.php | |
| parent | 1a57f3ed517e7dd68bd6c7a23802ebee138c128f (diff) | |
| parent | 3bb0ef8a82ec660ff8ef37b9abc93da94234649a (diff) | |
| download | volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.gz volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.bz2 volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/config.php')
| -rw-r--r-- | include/config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/config.php b/include/config.php index 9eaa6b2e6..87b91e51a 100644 --- a/include/config.php +++ b/include/config.php @@ -212,7 +212,7 @@ function load_pconfig($uid) { if(! array_key_exists($uid, $a->config)) $a->config[$uid] = array(); - $r = q("SELECT * FROM `pconfig` WHERE `uid` = %d", + $r = q("SELECT * FROM pconfig WHERE uid = %d", intval($uid) ); @@ -390,7 +390,7 @@ function load_xconfig($xchan) { if(! array_key_exists($xchan, $a->config)) $a->config[$xchan] = array(); - $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'", + $r = q("SELECT * FROM xconfig WHERE xchan = '%s'", dbesc($xchan) ); @@ -517,7 +517,7 @@ function del_xconfig($xchan, $family, $key) { if(x($a->config[$xchan][$family], $key)) unset($a->config[$xchan][$family][$key]); - $ret = q("DELETE FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s'", + $ret = q("DELETE FROM xconfig WHERE xchan = '%s' AND cat = '%s' AND k = '%s'", dbesc($xchan), dbesc($family), dbesc($key) |