From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 8 Aug 2011 02:21:36 +0000 (-0400)
Subject: Missing a set of ()
X-Git-Tag: api-2~40
X-Git-Url: https://src.bluestatic.org/?a=commitdiff_plain;h=7e64e4f7e44b43cab3b9ed924236970c72a56cb2;p=hoplite.git

Missing a set of ()
---

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) {