hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
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
parent 273612875f 7ee36ce3fa
commit ecf516406a
12 changed files with 128 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/databox.php
View File

@@ -111,15 +111,16 @@ class databox extends base
assert($sbas_id > 0);
$this->app = $app;
$this->connection = connection::getPDOConnection($app, $sbas_id);
$this->id = $sbas_id;
$connection_params = phrasea::sbas_params($this->app);
if ( ! isset($connection_params[$sbas_id])) {
if (! isset($connection_params[$sbas_id])) {
throw new NotFoundHttpException(sprintf('databox %d not found', $sbas_id));
}
$this->connection = connection::getPDOConnection($app, $sbas_id);
$this->host = $connection_params[$sbas_id]['host'];
$this->port = $connection_params[$sbas_id]['port'];
$this->user = $connection_params[$sbas_id]['user'];

2
lib/classes/eventsmanager/notify/autoregister.php
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);
}