diff options
| author | friendica <info@friendica.com> | 2012-11-01 22:23:13 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-11-01 22:23:13 -0700 |
| commit | 37653a376085e7f155ec101b937583f5d08012cc (patch) | |
| tree | b48fa161b2329e93ea8d40770bf8bda56721cf3a /mod | |
| parent | 5c9a68488a659e26fc7952c6d0addddeaecc2d92 (diff) | |
| download | volse-hubzilla-37653a376085e7f155ec101b937583f5d08012cc.tar.gz volse-hubzilla-37653a376085e7f155ec101b937583f5d08012cc.tar.bz2 volse-hubzilla-37653a376085e7f155ec101b937583f5d08012cc.zip | |
grrr... hashes aren't matching.
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/abook.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/abook.php b/mod/abook.php index 51cebd160..3d73217f1 100644 --- a/mod/abook.php +++ b/mod/abook.php @@ -509,7 +509,7 @@ EOT; } - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_chan = xchan.xchan_hash + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", intval(local_user()), intval(ABOOK_FLAG_SELF), diff --git a/mod/settings.php b/mod/settings.php index 6c31242f6..3e8134d5c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -719,7 +719,7 @@ function settings_content(&$a) { $channel = $a->get_channel(); - global $global_perms; + $global_perms = get_perms(); $perms = perms_text(); $permiss = array(); |