From 7e64e4f7e44b43cab3b9ed924236970c72a56cb2 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 7 Aug 2011 22:21:36 -0400
Subject: [PATCH] Missing a set of ()

---
 data/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/controller.php b/data/controller.php
index 46706c1..b3eda1a 100644
--- a/data/controller.php
+++ b/data/controller.php
@@ -44,7 +44,7 @@ class Controller extends http\RestAction
   /*! Gets the data from the model. */
   public function DoGet(http\Request $request, http\Response $response)
   {
-    $this->model->SetFromarray_merge($request->data, $request->data['_GET']);
+    $this->model->SetFrom(array_merge($request->data, $request->data['_GET']));
     try {
       $response->data = $this->model->Fetch();
     } catch (ModelException $e) {
-- 
2.22.5