Commit 9aa8feee authored by Evan Simpson's avatar Evan Simpson

Fix copy from history

parent 8adfb04d
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
############################################################################## ##############################################################################
"""Object Histories""" """Object Histories"""
__version__='$Revision: 1.8 $'[11:-2] __version__='$Revision: 1.9 $'[11:-2]
import Globals, ndiff, ExtensionClass import Globals, ndiff, ExtensionClass
from DateTime import DateTime from DateTime import DateTime
from Acquisition import Implicit from Acquisition import Implicit, aq_base
from string import join, split, atoi, strip from string import join, split, atoi, strip
from struct import pack, unpack from struct import pack, unpack
from cgi import escape from cgi import escape
...@@ -213,10 +213,12 @@ class Historical(ExtensionClass.Base): ...@@ -213,10 +213,12 @@ class Historical(ExtensionClass.Base):
self.manage_beforeHistoryCopy() self.manage_beforeHistoryCopy()
state=self._p_jar.oldstate(self, serial) state=self._p_jar.oldstate(self, serial)
# Scrub the object before restoring the old state # Scrub the object before restoring the old state
self._p_changed=0 base = aq_base(self)
self._p_deactivate() base._p_changed=0
self.__setstate__(state) base._p_deactivate()
self._p_changed=1 base.__setstate__(state)
base._p_changed=1
self.manage_afterHistoryCopy() self.manage_afterHistoryCopy()
if RESPONSE is not None and URL1 is not None: if RESPONSE is not None and URL1 is not None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment