From 0ad0046d40caac1522e09fe4151d18e2433d0cfd Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 16 Jan 2011 00:33:52 +0100 Subject: [PATCH] fixed highly critical bug in DataController --- lib/Controller/DataController.php | 2 +- lib/Interpreter/Interpreter.php | 2 +- lib/Util/Debug.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Controller/DataController.php b/lib/Controller/DataController.php index 0dbd434..e786680 100644 --- a/lib/Controller/DataController.php +++ b/lib/Controller/DataController.php @@ -72,7 +72,7 @@ class DataController extends Controller { $ec = new EntityController($this->view, $this->em); $entity = $ec->get($identifiers[0]); - $this->{$operation}($entity); + return $this->{$operation}($entity); } } diff --git a/lib/Interpreter/Interpreter.php b/lib/Interpreter/Interpreter.php index 092b001..55088f4 100644 --- a/lib/Interpreter/Interpreter.php +++ b/lib/Interpreter/Interpreter.php @@ -56,7 +56,7 @@ abstract class Interpreter implements InterpreterInterface { */ public function __construct(Model\Channel $channel, ORM\EntityManager $em, $from, $to) { $this->channel = $channel; - + // get dbal connection from EntityManager $this->conn = $em->getConnection(); diff --git a/lib/Util/Debug.php b/lib/Util/Debug.php index 9a898b5..9503c99 100644 --- a/lib/Util/Debug.php +++ b/lib/Util/Debug.php @@ -88,7 +88,7 @@ class Debug { 'file' => $info['file'], 'line' => $info['line'], //'time' => date('r'), - 'args' => array_slice($info['args'], 1), + 'args' => array_slice($info['args'], 1) //'trace' => array_slice($trace, 1) ); }