aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-21 21:44:37 -0700
committerzotlabs <mike@macgirvin.com>2016-10-21 21:44:37 -0700
commit6bf92979a2afe6769e572846e344ffaf3b0c7d85 (patch)
tree8ca50365c6676a37d91d3c070a7018fd6287b4e1
parentc5dcac4dbb9348da8b11bb99e4d9b5a50e16fad9 (diff)
parentbb1b6c906d9b45e7d700071a9b7b85a1e6c56077 (diff)
downloadvolse-hubzilla-6bf92979a2afe6769e572846e344ffaf3b0c7d85.tar.gz
volse-hubzilla-6bf92979a2afe6769e572846e344ffaf3b0c7d85.tar.bz2
volse-hubzilla-6bf92979a2afe6769e572846e344ffaf3b0c7d85.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--Zotlabs/Module/Profiles.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 127304f92..19a642a83 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -31,7 +31,7 @@ class Profiles extends \Zotlabs\Web\Controller {
// move every contact using this profile as their default to the user default
- $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
+ $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ",
intval(local_channel()),
dbesc($profile_guid),
intval(local_channel())