summaryrefslogtreecommitdiff
path: root/addons/wiki/wizard/wiki_show_diff.py
diff options
context:
space:
mode:
authorrpa (Open ERP) <rpa@tinyerp.com>2010-12-20 13:52:55 +0530
committerrpa (Open ERP) <rpa@tinyerp.com>2010-12-20 13:52:55 +0530
commit4e307d022c8fbdba848b8a4f57d668a4b6bd036f (patch)
tree249f8361bac695c0bec0c844d964194202d680a0 /addons/wiki/wizard/wiki_show_diff.py
parent6e34e7c52a3f37876b627fb5c80ac79d3c614807 (diff)
parentc2f85df411949653257c5b51f1578a1e40709510 (diff)
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101215042654-04ccazkz5v57ml3j bzr revid: rpa@tinyerp.com-20101216043335-ji5h61dra451cml4 bzr revid: rpa@tinyerp.com-20101220082255-1g3ea50rkjlacwqw
Diffstat (limited to 'addons/wiki/wizard/wiki_show_diff.py')
-rw-r--r--addons/wiki/wizard/wiki_show_diff.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/wiki/wizard/wiki_show_diff.py b/addons/wiki/wizard/wiki_show_diff.py
index 43f3f698611..278c91064df 100644
--- a/addons/wiki/wizard/wiki_show_diff.py
+++ b/addons/wiki/wizard/wiki_show_diff.py
@@ -33,6 +33,8 @@ class showdiff(osv.osv_memory):
""" @param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
"""
+ if context is None:
+ context = {}
history = self.pool.get('wiki.wiki.history')
ids = context.get('active_ids', [])