diff --git a/Doctrine/Locking/Manager/Pessimistic.php b/Doctrine/Locking/Manager/Pessimistic.php index b814ff5b4..22b43185a 100644 --- a/Doctrine/Locking/Manager/Pessimistic.php +++ b/Doctrine/Locking/Manager/Pessimistic.php @@ -210,7 +210,7 @@ class Doctrine_Locking_Manager_Pessimistic * When called without parameters all locks older than 15 minutes are released. * * @param integer $age The maximum valid age of locks in seconds - * @return boolean TRUE if locks have been released, FALSE if no locks were released + * @return integer The number of locks that have been released * @throws Doctrine_Locking_Exception If the release process failed due to database errors */ public function releaseAgedLocks($age = 900) @@ -226,7 +226,7 @@ class Doctrine_Locking_Manager_Pessimistic $count = $stmt->rowCount(); - return ($count > 0); + return $count; } catch(PDOException $pdoe) { diff --git a/Doctrine/Query.php b/Doctrine/Query.php index 17e128d4a..330611621 100644 --- a/Doctrine/Query.php +++ b/Doctrine/Query.php @@ -535,7 +535,7 @@ class Doctrine_Query extends Doctrine_Access { $pointer = $this->joins[$name]; $alias = $this->tables[$pointer]->getAlias($name); $fk = $this->tables[$pointer]->getForeignKey($alias); - if( ! $prev[$pointer]) + if( ! isset($prev[$pointer]) ) continue; $last = $prev[$pointer]->getLast();