Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed so inlinefuncs are only parses on the outgoing message path.

Browse source
This commit is contained in:
Griatch 2016-05-26 14:56:09 +02:00
parent 1f685f6952
commit 7c3d072915
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/sessionhandler.py
View file

@ -172,7 +172,8 @@ class SessionHandler(dict):
# wrong encoding set on the session. Set it to a safe one # wrong encoding set on the session. Set it to a safe one
session.protocol_flags["ENCODING"] = "utf-8" session.protocol_flags["ENCODING"] = "utf-8"
data = to_str(to_unicode(data), encoding=session.protocol_flags["ENCODING"]) data = to_str(to_unicode(data), encoding=session.protocol_flags["ENCODING"])
if _INLINEFUNC_ENABLED and not raw: if _INLINEFUNC_ENABLED and not raw and isinstance(self, ServerSessionHandler):
# only parse inlinefuncs on the outgoing path (sessionhandler->)
data = parse_inlinefunc(data, strip=strip_inlinefunc, session=session) data = parse_inlinefunc(data, strip=strip_inlinefunc, session=session)
return data return data
elif hasattr(data, "id") and hasattr(data, "db_date_created") \ elif hasattr(data, "id") and hasattr(data, "db_date_created") \