[Zope-Checkins] CVS: Packages/OFS - History.py:1.9

[Evan Simpson]

Update of /cvs-repository/Packages/OFS
In directory cvs.zope.org:/tmp/cvs-serv10139

Modified Files:
	History.py 
Log Message:
Fix copy from history


=== Packages/OFS/History.py 1.8 => 1.9 ===
 import Globals, ndiff, ExtensionClass
 from DateTime import DateTime
-from Acquisition import Implicit
+from Acquisition import Implicit, aq_base
 from string import join, split, atoi, strip
 from struct import pack, unpack
 from cgi import escape
@@ -213,10 +213,12 @@
             self.manage_beforeHistoryCopy()
             state=self._p_jar.oldstate(self, serial)
             # Scrub the object before restoring the old state
-            self._p_changed=0
-            self._p_deactivate()
-            self.__setstate__(state)
-            self._p_changed=1
+            base = aq_base(self)
+            base._p_changed=0
+            base._p_deactivate()
+            base.__setstate__(state)
+            base._p_changed=1
+            
             self.manage_afterHistoryCopy()
 
         if RESPONSE is not None and URL1 is not None: