Author: ornicar2
Date: 2010-02-09 17:09:08 +0100 (Tue, 09 Feb 2010)
New Revision: 27787
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
Log:
[Diem]
- fixed dmModuleManagerConfigHandler when Diem is embedded in the project
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
2010-02-09 16:00:07 UTC (rev 27786)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/config/dmModuleManagerConfigHandler.php
2010-02-09 16:09:08 UTC (rev 27787)
@@ -514,8 +514,19 @@
protected static function isProjectConfigFile($configFile)
{
- return
- 0 === strpos($configFile, sfConfig::get('sf_root_dir'))
- && 0 !== strpos($configFile, sfConfig::get('sf_plugins_dir'));
+ // Diem embedded in project
+ if(0 === strpos(dm::getDir(), sfConfig::get('sf_root_dir')))
+ {
+ return
+ 0 === strpos($configFile, sfConfig::get('sf_root_dir'))
+ && 0 !== strpos($configFile, sfConfig::get('sf_plugins_dir'))
+ && 0 !== strpos($configFile, dm::getDir());
+ }
+ else
+ {
+ return
+ 0 === strpos($configFile, sfConfig::get('sf_root_dir'))
+ && 0 !== strpos($configFile, sfConfig::get('sf_plugins_dir'));
+ }
}
}
\ No newline at end of file
--
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.
