Author: gimler
Date: 2010-02-08 09:11:59 +0100 (Mon, 08 Feb 2010)
New Revision: 27695
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmApplicationConfiguration.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmConfig.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmInlineConfigHandler.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmProjectConfiguration.php
Log:
[Diem] revert commits to tag ;(
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmApplicationConfiguration.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmApplicationConfiguration.php
2010-02-08 08:09:40 UTC (rev 27694)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmApplicationConfiguration.php
2010-02-08 08:11:59 UTC (rev 27695)
@@ -76,12 +76,12 @@
include($this->getConfigCache()->checkConfig('config/dm/config.yml'));
- /**
+ /*
* Replace sf default culture by first culture in dm cultures configuration
*/
sfConfig::set('sf_default_culture',
dmArray::first(sfConfig::get('dm_i18n_cultures')));
- /**
+ /*
* Symfony 1.3 registers sfAutoloadAgain on dev env. This causes huge
performance issues.
*/
if ($this->isDebug())
@@ -89,7 +89,7 @@
sfAutoloadAgain::getInstance()->unregister();
}
- /**
+ /*
* Now that we have the project config, we can configure the doctrine cache
*/
$this->configureDoctrineCache(Doctrine_Manager::getInstance());
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmConfig.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmConfig.php
2010-02-08 08:09:40 UTC (rev 27694)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmConfig.php
2010-02-08 08:11:59 UTC (rev 27695)
@@ -60,7 +60,7 @@
throw new dmException(sprintf('There is no setting called "%s".
Available settings are : %s', $name, implode(', ', array_keys(self::$config))));
}
- /**
+ /*
* Convert booleans to 0, 1 not to fail doctrine validation
*/
if (is_bool($value))
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmInlineConfigHandler.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmInlineConfigHandler.php
2010-02-08 08:09:40 UTC (rev 27694)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmInlineConfigHandler.php
2010-02-08 08:11:59 UTC (rev 27695)
@@ -1,6 +1,6 @@
<?php
-/**
+/*
* This file is part of the symfony package.
* (c) 2004-2006 Fabien Potencier <[email protected]>
*
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
2010-02-08 08:09:40 UTC (rev 27694)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
2010-02-08 08:11:59 UTC (rev 27695)
@@ -1,6 +1,6 @@
<?php
-/**
+/*
* This file is part of the symfony package.
* (c) 2004-2006 Fabien Potencier <[email protected]>
*
@@ -332,7 +332,7 @@
}
}
- /**
+ /*
* Returns plugins modules,
* not defined in the project but in a plugin
*/
@@ -364,7 +364,7 @@
protected function fixModuleConfig($moduleKey, $moduleConfig, $isInProject,
$plugin)
{
- /**
+ /*
* Extract plural from name
* name | plural
*/
Modified:
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmProjectConfiguration.php
===================================================================
---
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmProjectConfiguration.php
2010-02-08 08:09:40 UTC (rev 27694)
+++
plugins/diemPlugin/tags/RELEASE_5_0_0_BETA5/dmCorePlugin/lib/config/dmProjectConfiguration.php
2010-02-08 08:11:59 UTC (rev 27695)
@@ -35,7 +35,7 @@
}
}
- /**
+ /*
* @deprecated
* Please use $this->setWebDir instead
*/
@@ -48,25 +48,25 @@
{
Doctrine_Core::debug(sfConfig::get('dm_debug'));
- /**
+ /*
* Configure inheritance
*/
$manager->setAttribute(Doctrine_Core::ATTR_TABLE_CLASS, 'myDoctrineTable');
$manager->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'myDoctrineQuery');
$manager->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS,
'myDoctrineCollection');
- /**
+ /*
* Configure charset
*/
$manager->setCharset('utf8');
$manager->setCollate('utf8_unicode_ci');
- /**
+ /*
* Configure hydrators
*/
$manager->registerHydrator('dmFlat', 'Doctrine_Hydrator_dmFlatDriver');
- /**
+ /*
* Configure builder
*/
sfConfig::set('doctrine_model_builder_options', array(
--
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.
