hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-03-19 13:40:34 +01:00
parent 2ae33de7e9 2e63634867
commit 87cb0b2299
9 changed files with 429 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/eventsmanager/notify/orderdeliver.class.php
View File

@@ -202,7 +202,11 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
$basket = $repository->findOneBy(array(
'id' => $ssel_id
, 'pusher_id' => $this->core->getAuthenticatedUser()->get_id()
)
);
}
catch (Exception $e)
{