Author: ornicar2
Date: 2010-01-20 01:02:57 +0100 (Wed, 20 Jan 2010)
New Revision: 26904
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/context/dmContext.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
Log:
[Diem]
- cleaned dmContext
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/context/dmContext.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/context/dmContext.php
2010-01-19 22:01:59 UTC (rev 26903)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/context/dmContext.php
2010-01-20 00:02:57 UTC (rev 26904)
@@ -4,7 +4,6 @@
{
protected
$serviceContainer,
- $dmConfiguration,
$page,
$helper;
@@ -33,8 +32,6 @@
parent::initialize($configuration);
- $timer = dmDebug::timerOrNull('dmContext::initialize');
-
sfConfig::set('dm_debug', $this->getRequest()->getParameter('dm_debug',
false));
// load the service container instance
@@ -61,15 +58,12 @@
* and the service container...
*/
dmDoctrineQuery::setModuleManager($this->getModuleManager());
- dmDoctrineTable::setEventDispatcher($this->dispatcher);
dmDoctrineTable::setServiceContainer($this->serviceContainer);
$this->helper = $this->serviceContainer->getService('helper');
// notify that context is ready
$this->dispatcher->notify(new sfEvent($this, 'dm.context.loaded'));
-
- $timer && $timer->addTime();
}
/**
@@ -94,7 +88,6 @@
throw new sfException(sprintf('The "%s" object does not exist in the
current context.', $name));
}
-
/**
* Loads the symfony factories.
*/
@@ -114,8 +107,7 @@
/*
* Configure i18n
*/
- $this->factories['i18n']
- ->setUseInternalCatalogue($this->getUser()->can('admin'));
+
$this->factories['i18n']->setUseInternalCatalogue($this->getUser()->can('admin'));
}
public function reloadModuleManager()
@@ -157,8 +149,7 @@
public function configureServiceContainer(dmBaseServiceContainer
$serviceContainer)
{
- $serviceContainer->configure(
- array(
+ $serviceContainer->configure(array(
'context' => $this,
'doctrine_manager' => Doctrine_Manager::getInstance()
));
@@ -334,7 +325,7 @@
protected function checkProjectIsSetup()
{
- if (file_exists(dmOs::join(sfConfig::get('dm_data_dir'), 'lock')))
+ if (file_exists(sfConfig::get('dm_data_dir').'/lock'))
{
if (!dmConfig::isCli())
{
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-01-19 22:01:59 UTC (rev 26903)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/doctrine/table/dmDoctrineTable.php
2010-01-20 00:02:57 UTC (rev 26904)
@@ -555,6 +555,7 @@
{
self::$serviceContainer = $serviceContainer;
self::setModuleManager($serviceContainer->getService('module_manager'));
+ self::setEventDispatcher($serviceContainer->getService('dispatcher'));
}
public static function setModuleManager(dmModuleManager $moduleManager)
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
