aboutsummaryrefslogtreecommitdiffstats
path: root/mod/group.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-22 18:37:39 -0800
committerfriendica <info@friendica.com>2013-12-22 18:37:39 -0800
commit1a42580ad44f768ba8d4eb0669f3b8be03670e04 (patch)
treee40948063cea08c8c0ea4ece8efbcc6bef6464d8 /mod/group.php
parenteff38538eeaa3af0774c77d26c5b00dd79cb9e8c (diff)
downloadvolse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.gz
volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.tar.bz2
volse-hubzilla-1a42580ad44f768ba8d4eb0669f3b8be03670e04.zip
remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code.
Diffstat (limited to 'mod/group.php')
-rw-r--r--mod/group.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/group.php b/mod/group.php
index 352484e25..66e5fbf8e 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -30,7 +30,7 @@ function group_post(&$a) {
if((argc() == 2) && (intval(argv(1)))) {
check_form_security_token_redirectOnErr('/group', 'group_edit');
- $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(argv(1)),
intval(local_user())
);
@@ -44,7 +44,7 @@ function group_post(&$a) {
$public = intval($_POST['public']);
if((strlen($groupname)) && (($groupname != $group['name']) || ($public != $group['visible']))) {
- $r = q("UPDATE `group` SET `name` = '%s', visible = %d WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ $r = q("UPDATE `groups` SET `name` = '%s', visible = %d WHERE `uid` = %d AND `id` = %d LIMIT 1",
dbesc($groupname),
intval($public),
intval(local_user()),
@@ -97,7 +97,7 @@ function group_content(&$a) {
check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
if(intval(argv(2))) {
- $r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(argv(2)),
intval(local_user())
);
@@ -132,7 +132,7 @@ function group_content(&$a) {
if((argc() > 1) && (intval(argv(1)))) {
require_once('include/acl_selectors.php');
- $r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
intval(argv(1)),
intval(local_user())
);