--- versionedFile/extVersionedFile.py	2008/10/29 12:12:25	1.30
+++ versionedFile/extVersionedFile.py	2009/06/05 07:32:17	1.31
@@ -1076,14 +1076,23 @@ class extVersionedFile(CatalogAware,Fold
         return vl
 
     security.declareProtected('AUTHENTICATED_USER','forceunlock')   
-    def forceunlock(self,RESPONSE=None):
+    def forceunlock(self,RESPONSE=None,user=None):
         """unlock"""
         #safe who had the lock
+        logging.debug("extVersionFile: (forceunlock)"+str(user))
         if self.lockedBy:
-            self.brokenLock=str(self.lockedBy)
+            if user is not None:
+                if str(self.lockedBy)==user:
+                    self.brokenLock=str(self.lockedBy)
+                    self.lockedBy=''
+                else:
+                    self.brokenLock=""
+            else:
+                self.brokenLock=str(self.lockedBy)
+                self.lockedBy=''
         else:
             self.brokenLock=""
-        self.lockedBy=''
+        
         return self.brokenLock
 
     security.declareProtected('AUTHENTICATED_USER','unlock')