paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 00:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

gather_subscriptions: Fix confusing overwriting of local variable stream.

Browse Source 
(imported from commit cfe369869de5f13579ff0e0b91ec0a735e2fe81c)
This commit is contained in:
Tim Abbott
2013-09-30 15:53:49 -04:00
parent d437f6602f
commit 543ba03ff6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zerver/lib/actions.py
View File

@@ -1457,18 +1457,18 @@ def gather_subscriptions(user_profile):
if stream.invite_only and not sub.active: if stream.invite_only and not sub.active:
subscribers = None subscribers = None
stream = {'name': stream.name, stream_dict = {'name': stream.name,
'in_home_view': sub.in_home_view, 'in_home_view': sub.in_home_view,
'invite_only': stream.invite_only, 'invite_only': stream.invite_only,
'color': sub.color, 'color': sub.color,
'notifications': sub.notifications, 'notifications': sub.notifications,
'email_address': encode_email_address(stream)} 'email_address': encode_email_address(stream)}
if subscribers is not None: if subscribers is not None:
stream['subscribers'] = subscribers stream_dict['subscribers'] = subscribers
if sub.active: if sub.active:
subscribed.append(stream) subscribed.append(stream_dict)
else: else:
unsubscribed.append(stream) unsubscribed.append(stream_dict)
return (sorted(subscribed), sorted(unsubscribed)) return (sorted(subscribed), sorted(unsubscribed))