X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Forder.php;h=69026bfcde75668b5c0bc52ac4bdb1a9e5bf172b;hb=87843f0ab772989647ce3116f2508b781f56f0b6;hp=9c9e1c97b60d45f272050207d8a1a070da5a0bb0;hpb=d446396414b5741afb5a9580c0dee234445a201c;p=readifood.git

diff --git a/lib/order.php b/lib/order.php
index 9c9e1c9..69026bf 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -40,14 +40,7 @@
 
   function show_orders($offset, $per_page, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
     /* XXX: Use Propel methods. */
-    if (isset($state_mask)) {
-      $order_ids = array();
-      $dbh = Propel::getConnection();
-      $sth = $dbh->prepare("select * from OrderState o where updated=(select max(updated) from OrderState where order_id=o.order_id) and state & $state_mask");
-      $sth->execute();
-      $order_states = OrderStatePeer::populateObjects($sth);
-      foreach ($order_states as $order_state) $order_ids[] = $order_state->getOrderId();
-    }
+    if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
     $q = new OrderQuery;
     if (isset($requester_ids)) $q->filterByRequesterId($requester_ids);
     if (isset($beneficiary_ids)) $q->filterByBeneficiaryId($beneficiary_ids);