From d42f27ad40aa23261a80e7f1aa53ee8ee003afb8 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Fri, 30 May 2014 17:32:24 +0200
Subject: [PATCH] Fix PHRAS-146 Order of a basket generates an error when the
 content comes from two different collections

---
 lib/Alchemy/Phrasea/Controller/Prod/Order.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Order.php b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
index dc8a319f11..829df71289 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Order.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Order.php
@@ -155,9 +155,10 @@ class Order implements ControllerProviderInterface
 
         try {
             $records = RecordsRequest::fromRequest($app, $request, true, array('cancmd'));
-            $query = new \User_Query($app);
 
             foreach ($records as $key => $record) {
+                $query = new \User_Query($app);
+
                 if ($collectionHasOrderAdmins->containsKey($record->get_base_id())) {
                     if (!$collectionHasOrderAdmins->get($record->get_base_id())) {
                         $records->remove($key);
@@ -182,8 +183,8 @@ class Order implements ControllerProviderInterface
             }
 
             $noAdmins = $collectionHasOrderAdmins->forAll(function ($key, $hasAdmin) {
-                    return false === $hasAdmin;
-                });
+                return false === $hasAdmin;
+            });
 
             if ($noAdmins) {
                 $msg = _('There is no one to validate orders, please contact an administrator');