From 4fe6de5ffc964ab69ee9fee7303ac9fa0b57c721 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 15:21:04 +0200 Subject: [PATCH] Replaced underscores in repositories --- lib/Doctrine/Repositories/SessionRepository.php | 6 +++--- lib/Doctrine/Repositories/UserSettingRepository.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 7175398674..c0e198ae4e 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -34,15 +34,15 @@ class SessionRepository extends EntityRepository $base_ids = array_keys($user->ACL()->get_granted_base()); $dql = 'SELECT f FROM Entities\Feed f - WHERE f.base_id IS NULL '; + WHERE f.baseId IS NULL '; if (count($base_ids) > 0) { - $dql .= ' OR f.base_id + $dql .= ' OR f.baseId IN (' . implode(', ', $base_ids) . ') '; } $dql .= ' OR f.public = true - ORDER BY f.updated_on DESC'; + ORDER BY f.updatedOn DESC'; $query = $this->_em->createQuery($dql); diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index 6b1ed462fd..1591e76e8f 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -38,7 +38,7 @@ class UserSettingRepository extends EntityRepository $qb->Where($qb->expr()->in('f.feed', $feeds)); } - $qb->orderBy('f.updated_on', 'DESC'); + $qb->orderBy('f.updatedOn', 'DESC'); if ($offsetStart) { $qb->setFirstResult(max(0, (int) $offsetStart));