From 935793e4a44eaa7faeaaceae6577472e17d81367 Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Thu, 28 Jun 2012 11:53:54 +0000
Subject: [PATCH]
---
core/trunk/core/tests/class/DataObjectController.php | 8 +-------
core/trunk/core/tests/class/MessageController.php | 4 ++--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/core/trunk/core/tests/class/DataObjectController.php b/core/trunk/core/tests/class/DataObjectController.php
index cfcfd4f4707..6eb3257e2a4 100644
--- a/core/trunk/core/tests/class/DataObjectController.php
+++ b/core/trunk/core/tests/class/DataObjectController.php
@@ -135,17 +135,11 @@ class dataObjectController extends DOMDocument
$messageId = 'libxml' . $libXMLError->code;
$messageParams = array($libXMLError->message);
$messageLang = $_SESSION['config']['lang'];
- $message = $this->messageController->getMessageText(
- $messageId,
- $messageLang,
- $messageParams
- );
- /*
$message = $this->messageController->sendMessage(
$messageId,
$messageLang,
$messageParams
- );*/
+ );
$this->messages[] = $message;
}
return false;
diff --git a/core/trunk/core/tests/class/MessageController.php b/core/trunk/core/tests/class/MessageController.php
index d5cc16e8c87..3fccb33933c 100644
--- a/core/trunk/core/tests/class/MessageController.php
+++ b/core/trunk/core/tests/class/MessageController.php
@@ -64,7 +64,7 @@ class MessageController
if(!$messageLang) $messageLang = $_SESSION['config']['lang'];
// Get message definition
- $messageDefinition = $this->getMessageDefinition($messageId))
+ $messageDefinition = $this->getMessageDefinition($messageId);
// Get Text
$messageText = $this->makeMessageText(
@@ -72,7 +72,7 @@ class MessageController
$messageLang,
$messageParams
);
- if(!$messageText) return "##" . $messageId . "##";
+ if(!$messageText) return $messageId;
return $messageText;
}
--
GitLab