DataObjects/Core_watch.php

[Pman.Core] / Lock.php

diff --git a/Lock.php b/Lock.php
index 3e394bb..a3a684c 100644 (file)
--- a/Lock.php
+++ b/Lock.php
@@ -100,7 +100,7 @@ class Pman_Core_Lock extends Pman
         }
         // is there a current lock on the item..
         
-        $curlock = DB_DataObject::factory('Core_locking');
+        $curlock = DB_DataObject::factory('core_locking');
         $curlock->setFrom(array(
             'on_id' => $_REQUEST['on_id'],
             'on_table' => strtolower($_REQUEST['on_table'])
@@ -117,7 +117,7 @@ class Pman_Core_Lock extends Pman
         
         if ($nlocks && empty($_REQUEST['force'])) {
            // DB_DataObjecT::debugLevel(1);
-            $ar = $curlock->fetchAll('person_id', 'created');
+            $ar = $curlock_ex->fetchAll('person_id', 'created');
             $p = DB_DataObject::factory('Person');
             $p->selectAdd();
             $p->selectAdd('id,name,email');
@@ -136,12 +136,13 @@ class Pman_Core_Lock extends Pman
         $ulocks = $curlock->count();
         if ($ulocks) {
             // trash all the locks..
-            $curlock = DB_DataObject::factory('Core_locking');
+            $curlock = DB_DataObject::factory('core_locking');
             $curlock->setFrom(array(
                 'on_id' => $_REQUEST['on_id'],
-                'on_table' => strtolower($_REQUEST['on_table'])
+                'on_table' => strtolower($_REQUEST['on_table']),
+                'person_id' => $this->authUser->id
             ));
-            $curlock->person_id = $this->authUser->id;
+            
             $curlock->find();
             while($curlock->fetch()) {
                 $cc =clone($curlock);