https://src.bluestatic.org
/
hoplite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
42e8595
)
Missing a set of ()
author
Robert Sesek <rsesek@bluestatic.org>
Mon, 8 Aug 2011 02:21:36 +0000
(22:21 -0400)
committer
Robert Sesek <rsesek@bluestatic.org>
Mon, 8 Aug 2011 02:21:36 +0000
(22:21 -0400)
data/controller.php
patch
|
blob
|
history
diff --git
a/data/controller.php
b/data/controller.php
index 46706c10ee279d808b5dfa5edbaf0150eb121edd..b3eda1a679c88979ef0c8de57567c5434277e9e6 100644
(file)
--- 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->SetFrom
array_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) {