From 205a21820c0a2b18398d5400de87b72085beea24 Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Thu, 28 Jun 2012 09:57:30 +0000
Subject: [PATCH]
---
core/trunk/core/tests/class/DataObjectController.php | 9 ++++++---
core/trunk/core/tests/class/MessageController.php | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/trunk/core/tests/class/DataObjectController.php b/core/trunk/core/tests/class/DataObjectController.php
index 6cc23eb0370..44728c8e608 100644
--- a/core/trunk/core/tests/class/DataObjectController.php
+++ b/core/trunk/core/tests/class/DataObjectController.php
@@ -12,6 +12,7 @@ class dataObjectController extends DOMDocument
public $prototypes = array();
public $dataAccessServices = array();
private $messageController;
+ private $messages = array();
public function dataObjectController()
{
@@ -133,13 +134,13 @@ class dataObjectController extends DOMDocument
$messageParams = array($libXMLError->message);
$messageLang = $_SESSION['config']['lang'];
$messageFunc = 'dataObjectController::validate';
- $this->messageController->sendMessage(
+ $message = $this->messageController->sendMessage(
$messageId,
$messageParams,
$messageLang,
$messageFunc
);
-
+ $this->messages[] = $message;
}
return false;
}
@@ -148,7 +149,9 @@ class dataObjectController extends DOMDocument
public function getMessages()
{
- return $this->messages;
+ $message = $this->messages;
+ $this->messages = array();
+ return $messages;
}
public function save($dataObject)
diff --git a/core/trunk/core/tests/class/MessageController.php b/core/trunk/core/tests/class/MessageController.php
index 9d6823f77f6..fc673b3f03b 100644
--- a/core/trunk/core/tests/class/MessageController.php
+++ b/core/trunk/core/tests/class/MessageController.php
@@ -76,7 +76,7 @@ class MessageController
$messageFunc
);
- $_SESSION['messages'][] = (array)$message;
+ $_SESSION['messages'][] = $message;
return $message;
}
--
GitLab