Author: Jonathan.Wage
Date: 2010-04-11 01:10:19 +0200 (Sun, 11 Apr 2010)
New Revision: 29070
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalCMFPlugin/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/task/sfSympalCreateSiteTask.class.php
Log:
[sfSympalPlugin] Synchronizing git repository to Symfony Plugins SVN
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalCMFPlugin/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalCMFPlugin/lib/model/doctrine/PluginsfSympalContent.class.php
2010-04-10 22:34:23 UTC (rev 29069)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalCMFPlugin/lib/model/doctrine/PluginsfSympalContent.class.php
2010-04-10 23:10:19 UTC (rev 29070)
@@ -648,12 +648,12 @@
{
$template = $this->getType()->getTemplate();
}
- $templates =
sfSympalConfiguration::getActive()->getContentTemplates($this->getType()->getSlug());
+ $templates =
sfSympalConfiguration::getActive()->getContentTemplates($this->getType()->getName());
if (isset($templates[$template]))
{
$template = $templates[$template]['template'];
}
- $template = $template ? $template :
sfSympalConfig::get($this->getType()->getSlug(), 'default_content_template',
sfSympalConfig::get('default_content_template'));
+ $template = $template ? $template :
sfSympalConfig::get($this->getType()->getName(), 'default_content_template',
sfSympalConfig::get('default_content_template'));
return $template;
}
@@ -666,7 +666,7 @@
} else if ($theme = $this->getSite()->getTheme()) {
return $theme;
} else {
- return sfSympalConfig::get($this->getType()->getSlug(), 'default_theme',
sfSympalConfig::get('theme', 'default_theme', $this->getSite()->getSlug()));
+ return sfSympalConfig::get($this->getType()->getName(), 'default_theme',
sfSympalConfig::get('theme', 'default_theme', $this->getSite()->getSlug()));
}
}
Modified: plugins/sfSympalPlugin/trunk/lib/task/sfSympalCreateSiteTask.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/task/sfSympalCreateSiteTask.class.php
2010-04-10 22:34:23 UTC (rev 29069)
+++ plugins/sfSympalPlugin/trunk/lib/task/sfSympalCreateSiteTask.class.php
2010-04-10 23:10:19 UTC (rev 29070)
@@ -22,9 +22,7 @@
));
$this->addOptions(array(
- new sfCommandOption('layout', null, sfCommandOption::PARAMETER_OPTIONAL,
'The site/application layout', null),
new sfCommandOption('interactive', null,
sfCommandOption::PARAMETER_NONE, 'Interactive installation option'),
- new sfCommandOption('load-dummy-data', null,
sfCommandOption::PARAMETER_NONE, 'Load dummy data for the newly created site.'),
new sfCommandOption('no-confirmation', null,
sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
));
@@ -85,11 +83,6 @@
$site->description = 'Description for '.$arguments['site'].' site.';
}
- if ($options['layout'])
- {
- $site->layout = $options['layout'];
- }
-
$site->save();
return $site;
@@ -100,7 +93,11 @@
try {
$task = new sfGenerateAppTask($this->dispatcher, $this->formatter);
$task->run(array($application), array());
- } catch (Exception $e) {}
+ }
+ catch (Exception $e)
+ {
+ // In case the app already exists, swallow the error
+ }
}
protected function _prepareApplication($application)
--
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.
