Permalink
Browse files

Compatibility with 2.1-dev

  • Loading branch information...
dg committed Mar 13, 2013
1 parent 95a4d7a commit afd9eebd68085ff299f59688073c61c0f7c68976
Showing with 8 additions and 11 deletions.
  1. +3 −2 CD-collection/app/model/Authenticator.php
  2. +5 −9 CD-collection/app/presenters/DashboardPresenter.php
@@ -40,8 +40,9 @@ public function authenticate(array $credentials)
throw new Security\AuthenticationException('The password is incorrect.', self::INVALID_CREDENTIAL);
}
- unset($row->password);
- return new Security\Identity($row->id, NULL, $row->toArray());
+ $arr = $row->toArray();
+ unset($arr['password']);
+ return new Security\Identity($row->id, NULL, $arr);
}
@@ -6,15 +6,11 @@
class DashboardPresenter extends BasePresenter
{
- /** @var AlbumRepository */
- private $albums;
-
-
- public function inject(AlbumRepository $albums)
- {
- $this->albums = $albums;
- }
-
+ /**
+ * @var AlbumRepository
+ * @inject
+ */
+ public $albums;
protected function startup()

0 comments on commit afd9eeb

Please sign in to comment.