Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
This commit is contained in:
Romain Neutron
2013-12-19 10:31:52 +01:00
12 changed files with 128 additions and 35 deletions

View File

@@ -198,7 +198,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
}
if ($readyToSend) {
$mail = MailInfoSomebodyAutoregistered::create($this->app, $receiver, $body);
$mail = MailInfoSomebodyAutoregistered::create($this->app, $receiver, null, $body);
$this->app['notification.deliverer']->deliver($mail);
}