diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
| commit | c8af19c69c03b39d5eded833a2d9d8ed9ab5826c (patch) | |
| tree | 16ded6330f1baa9d8e889978c9e093f1e90d7d85 /include/permissions.php | |
| parent | 92d0a9404ff92da23b558f9a73a3150f97b6a08e (diff) | |
| parent | 18cae8a78cb3df8ffcd9e4787c3b572c799036da (diff) | |
| download | volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.gz volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.bz2 volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/permissions.php b/include/permissions.php index 0ad28b3f1..b078de4d5 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -257,7 +257,7 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { $channel_perm = $global_perms[$permission][0]; - $r = q("select %s, channel_hash from channel where channel_id = %d limit 1", + $r = q("select %s, channel_pageflags, channel_hash from channel where channel_id = %d limit 1", dbesc($channel_perm), intval($uid) ); |