From 8d140268002471697ef53b428b99202ea4d5519e Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 10 Feb 2014 23:03:00 +0100 Subject: [PATCH] Opps, forgot to return value + more logging. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/database/class_BaseDatabaseWrapper.php | 5 ++++- .../main/database/databases/class_LocalFileDatabase.php | 1 + inc/classes/middleware/database/class_DatabaseConnection.php | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/inc/classes/main/database/class_BaseDatabaseWrapper.php b/inc/classes/main/database/class_BaseDatabaseWrapper.php index 35864618..28ee12cf 100644 --- a/inc/classes/main/database/class_BaseDatabaseWrapper.php +++ b/inc/classes/main/database/class_BaseDatabaseWrapper.php @@ -230,7 +230,10 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem { */ public function removeNonPublicDataFromArray (array $data) { /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('WRAPPER[' . $this->__toString() . ']: Calling this->getDatabaseInstance()->removeNonPublicDataFromArray(data) ...'); - $this->getDatabaseInstance()->removeNonPublicDataFromArray($data); + $data = $this->getDatabaseInstance()->removeNonPublicDataFromArray($data); + + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('WRAPPER[' . $this->__toString() . ']: data[]=' . gettype($data)); + return $data; } } diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php index 7fd9e90c..59d89aab 100644 --- a/inc/classes/main/database/databases/class_LocalFileDatabase.php +++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php @@ -609,6 +609,7 @@ class LocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackend { unset($data[$this->indexKey]); // Return it + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: data[' . gettype($data) . ']='.print_r($data, TRUE)); return $data; } } diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php index e090cf2a..65fed3cd 100644 --- a/inc/classes/middleware/database/class_DatabaseConnection.php +++ b/inc/classes/middleware/database/class_DatabaseConnection.php @@ -187,7 +187,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re public function removeNonPublicDataFromArray (array $data) { // Call database backend /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: Calling this->dbLayer->removeNonPublicDataFromArray(data) ...'); - return $this->dbLayer->removeNonPublicDataFromArray($data); + $data = $this->dbLayer->removeNonPublicDataFromArray($data); + + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DB-CONNECTION[' . $this->__toString() . ']: data[]=' . gettype($data)); + return $data; } } -- 2.39.5