orbit-oss/flask
4
5
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 57920a5808 into 7242abcfb2

Browse source
This commit is contained in:
GitHub Merge Button 2011-05-24 07:40:54 -07:00
commit 18a7c09c87
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flask/helpers.py
View file

@ -249,7 +249,8 @@ def get_flashed_messages(with_categories=False):
"""
flashes = _request_ctx_stack.top.flashes
if flashes is None:
_request_ctx_stack.top.flashes = flashes = session.pop('_flashes', [])
_request_ctx_stack.top.flashes = flashes = session.pop('_flashes') \
if '_flashes' in session else []
if not with_categories:
return [x[1] for x in flashes]
return flashes