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

Fix Core load event manager

Browse Source
This commit is contained in:
Romain Neutron
2011-12-27 15:35:03 +01:00
parent e3727938fb
commit affd3e28e0
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Core.php
View File

@@ -224,8 +224,8 @@ class Core extends \Pimple
protected function enableEvents()
{
\phrasea::load_events();
$events = \eventsmanager_broker::getInstance(appbox::get_instance(), $this);
$events->start();
return;
}

8
lib/classes/eventsmanager/broker.class.php
View File

@@ -18,10 +18,10 @@ class eventsmanager_broker
*/
protected $core;
private function __construct(appbox &$appbox)
private function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core)
{
$this->appbox = $appbox;
$this->core = bootstrap::getCore();
$this->core = $core;
return $this;
}
@@ -29,11 +29,11 @@ class eventsmanager_broker
/**
* @return eventsmanager
*/
public static function getInstance(appbox &$appbox)
public static function getInstance(appbox &$appbox, \Alchemy\Phrasea\Core $core)
{
if (!self::$_instance)
{
self::$_instance = new self($appbox);
self::$_instance = new self($appbox, $core);
}
return self::$_instance;

6
lib/classes/phrasea.class.php
View File

@@ -269,12 +269,6 @@ class phrasea
return $user->ACL()->get_granted_base() > 0;
}
public static function load_events()
{
$events = eventsmanager_broker::getInstance(appbox::get_instance());
$events->start();
}
public static function use_i18n($locale, $textdomain = 'phraseanet')
{
$codeset = "UTF-8";