diff --git a/lib/Doctrine/Resource/Client.php b/lib/Doctrine/Resource/Client.php index 9a8321fc8..3674c2133 100644 --- a/lib/Doctrine/Resource/Client.php +++ b/lib/Doctrine/Resource/Client.php @@ -15,8 +15,6 @@ class Doctrine_Resource_Client extends Doctrine_Resource public function newRecord($model) { - $record = new Doctrine_Resource_Record($model, $this->config); - - return $record; + return new Doctrine_Resource_Record($model, $this->config); } } \ No newline at end of file diff --git a/lib/Doctrine/Resource/Collection.php b/lib/Doctrine/Resource/Collection.php index ca4133751..64256d8a5 100644 --- a/lib/Doctrine/Resource/Collection.php +++ b/lib/Doctrine/Resource/Collection.php @@ -24,7 +24,7 @@ class Doctrine_Resource_Collection extends Doctrine_Access implements Countable, public function getFirst() { - return $this->data[0]; + return isset($this->data[0]) ? $this->data[0]:null; } public function toArray()