Author: ornicar2
Date: 2010-02-08 11:40:53 +0100 (Mon, 08 Feb 2010)
New Revision: 27719
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/config/dmAdminPluginConfiguration.class.php
plugins/diemPlugin/trunk/dmAdminPlugin/lib/sitemap/dmXmlSitemapGenerator.php
plugins/diemPlugin/trunk/dmFrontPlugin/config/dmFrontPluginConfiguration.class.php
Log:
[Diem]
- updated admin and front default modules
- updated xml_sitemap_generator service to exclude main/signin page
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/config/dmAdminPluginConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/config/dmAdminPluginConfiguration.class.php
2010-02-08 10:39:43 UTC (rev 27718)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/config/dmAdminPluginConfiguration.class.php
2010-02-08 10:40:53 UTC (rev 27719)
@@ -3,7 +3,7 @@
{
protected static
$helpers = array('Dm'),
- $externalModules = array('dmAuthAdmin', 'dmUserAdmin', 'dmPermissionAdmin',
'dmGroupAdmin');
+ $externalModules = array('dmUserAdmin', 'dmPermissionAdmin', 'dmGroupAdmin');
public function configure()
{
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/sitemap/dmXmlSitemapGenerator.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/lib/sitemap/dmXmlSitemapGenerator.php
2010-02-08 10:39:43 UTC (rev 27718)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/lib/sitemap/dmXmlSitemapGenerator.php
2010-02-08 10:40:53 UTC (rev 27719)
@@ -119,7 +119,7 @@
return dmDb::query('DmPage p')->withI18n($culture)
->where('pTranslation.is_secure = ?', false)
->addWhere('pTranslation.is_active = ?', true)
- ->addWhere('p.module != ? OR ( p.action != ? AND p.action != ? AND
p.action != ?)', array('main', 'error404', 'search', 'login'))
+ ->addWhere('p.module != ? OR ( p.action != ? AND p.action != ? AND
p.action != ?)', array('main', 'error404', 'search', 'signin'))
->orderBy('p.lft asc')
->fetchRecords();
}
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/config/dmFrontPluginConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/config/dmFrontPluginConfiguration.class.php
2010-02-08 10:39:43 UTC (rev 27718)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/config/dmFrontPluginConfiguration.class.php
2010-02-08 10:40:53 UTC (rev 27719)
@@ -5,7 +5,7 @@
protected static
$dependencies = array(),
$helpers = array('Dm', 'DmFront'),
- $externalModules = array('dmAuthAdmin');
+ $externalModules = array('dmUser');
public function configure()
{
@@ -21,8 +21,6 @@
$this->enableModules();
$this->enableHelpers();
-
- $this->loadConfiguration();
}
protected function enableModules()
@@ -52,17 +50,4 @@
{
sfConfig::set('sf_standard_helpers',
array_unique(array_merge(self::$helpers, sfConfig::get('sf_standard_helpers',
array()))));
}
-
- protected function loadConfiguration()
- {
- if ('default' === sfConfig::get('sf_login_module'))
- {
- sfConfig::set('sf_login_module', 'dmFront');
- }
-
- if ('default' === sfConfig::get('sf_secure_module'))
- {
- sfConfig::set('sf_secure_module', 'dmFront');
- }
- }
}
\ 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.
