diff options
| author | friendica <info@friendica.com> | 2013-05-14 21:27:11 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-14 21:27:11 -0700 |
| commit | 462f91c2cae070ea4912508ad80f04cb4cd93355 (patch) | |
| tree | 1cc86cc53c0677f42d928aed41605f411fc02d7b | |
| parent | 5e4b9d7766ceffd19785f14443cc1b4d4f675d4e (diff) | |
| parent | 32c1e34aa6cb7dee09901f92f925da83a84051d7 (diff) | |
| download | volse-hubzilla-462f91c2cae070ea4912508ad80f04cb4cd93355.tar.gz volse-hubzilla-462f91c2cae070ea4912508ad80f04cb4cd93355.tar.bz2 volse-hubzilla-462f91c2cae070ea4912508ad80f04cb4cd93355.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/identity.php | 4 | ||||
| -rw-r--r-- | mod/import.php | 4 | ||||
| -rw-r--r-- | mod/lockview.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/identity.php b/include/identity.php index c8910c018..4bbc8970b 100644 --- a/include/identity.php +++ b/include/identity.php @@ -293,7 +293,7 @@ function identity_basic_export($channel_id) { $ret['hubloc'] = $r; } - $r = q("select * from group where uid = %d ", + $r = q("select * from `group` where uid = %d ", intval($channel_id) ); @@ -372,4 +372,4 @@ function identity_basic_import($arr, $seize_primary = false) { return $ret; -}
\ No newline at end of file +} diff --git a/mod/import.php b/mod/import.php index 4602c8aa8..9443f5c60 100644 --- a/mod/import.php +++ b/mod/import.php @@ -279,7 +279,7 @@ function import_post(&$a) { . implode("', '", array_values($group)) . "')" ); } - $r = q("select * from group where uid = %d", + $r = q("select * from `group` where uid = %d", intval($channel['channel_id']) ); if($r) { @@ -341,4 +341,4 @@ function import_content(&$a) { return $o; -}
\ No newline at end of file +} diff --git a/mod/lockview.php b/mod/lockview.php index 01a6997ee..7dda85623 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -49,7 +49,7 @@ function lockview_content(&$a) { stringify_array_elms($deny_users,true); if(count($allowed_groups)) { - $r = q("SELECT name FROM group WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); + $r = q("SELECT name FROM `group` WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); if($r) foreach($r as $rr) $l[] = '<b>' . $rr['name'] . '</b>'; @@ -61,7 +61,7 @@ function lockview_content(&$a) { $l[] = $rr['xchan_name']; } if(count($deny_groups)) { - $r = q("SELECT name FROM group WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); + $r = q("SELECT name FROM `group` WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); if($r) foreach($r as $rr) $l[] = '<b><strike>' . $rr['name'] . '</strike></b>'; |