aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-20 15:35:14 -0800
committerfriendica <info@friendica.com>2014-11-20 15:35:14 -0800
commit6cb9ee74990f6e7193ebc7228c00b483b82b87a9 (patch)
treef4123c00d371a5e1f1de98cbb446cb321b1e9b5b /include/identity.php
parentafd8b2ddf25d3486d200f9da8ff3cd74131a1df4 (diff)
parent28a0209ffdf7d9c2ba8514def9a9085650a389fb (diff)
downloadvolse-hubzilla-6cb9ee74990f6e7193ebc7228c00b483b82b87a9.tar.gz
volse-hubzilla-6cb9ee74990f6e7193ebc7228c00b483b82b87a9.tar.bz2
volse-hubzilla-6cb9ee74990f6e7193ebc7228c00b483b82b87a9.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php
index a238959a5..11da745da 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1473,7 +1473,7 @@ function get_channel_by_nick($nick) {
function identity_selector() {
if(local_user()) {
- $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and not ( channel_pageflags & %d )>0 order by channel_name ",
+ $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and (channel_pageflags & %d) = 0 order by channel_name ",
intval(get_account_id()),
intval(PAGE_REMOVED)
);
@@ -1573,7 +1573,7 @@ function notifications_on($channel_id,$value) {
function get_channel_default_perms($uid) {
- $r = q("select abook_my_perms from abook where abook_channel = %d and abook_flags & %d limit 1",
+ $r = q("select abook_my_perms from abook where abook_channel = %d and (abook_flags & %d) > 0 limit 1",
intval($uid),
intval(ABOOK_FLAG_SELF)
);