diff options
| author | zottel <github@zottel.net> | 2016-08-05 09:17:00 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-05 09:17:00 +0200 |
| commit | 6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e (patch) | |
| tree | 2ec87e623880253714c80e5ac927a67c9dda0df9 /Zotlabs | |
| parent | dd83f6f3567ffa58b6addf2bc070ee244c868138 (diff) | |
| parent | 92862f93f31beb009247144bae5d8b0a58b562b5 (diff) | |
| download | volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.tar.gz volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.tar.bz2 volse-hubzilla-6ba142fd33a74a7bdb4f3dfc8c0c0f507c293a2e.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Group.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php index 254ee6ef2..291566c6d 100644 --- a/Zotlabs/Module/Group.php +++ b/Zotlabs/Module/Group.php @@ -101,7 +101,7 @@ class Group extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); if(intval(argv(2))) { - $r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("SELECT `gname` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(argv(2)), intval(local_channel()) ); diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index ecf6d03d6..57a0aa535 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -145,7 +145,7 @@ class Settings extends \Zotlabs\Web\Controller { return; } if($atoken_id) { - $r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s' + $r = q("update atoken set atoken_name = '%s', atoken_token = '%s', atoken_expires = '%s' where atoken_id = %d and atoken_uid = %d", dbesc($name), dbesc($token), |