Author: Jonathan.Wage
Date: 2010-02-17 16:24:43 +0100 (Wed, 17 Feb 2010)
New Revision: 28083
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/task/sfSympalPluginUninstallTask.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalSearchPlugin/lib/task/sfSympalBuildSearchIndexTask.class.php
Log:
[1.4][sfSympalPlugin][1.0] Reverting change to require context in order to
install
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-02-17 15:23:55 UTC (rev 28082)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContent.class.php
2010-02-17 15:24:43 UTC (rev 28083)
@@ -808,7 +808,7 @@
foreach ($this->getSlots() as $slot)
{
$slot->setContentRenderedFor($this);
- $searchData[$slot->getName()] = $slot->render();
+ $searchData[$slot->getName()] = $slot->getValue();
}
return $searchData;
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
2010-02-17 15:23:55 UTC (rev 28082)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalInstallPlugin/lib/task/sfSympalInstallTask.class.php
2010-02-17 15:24:43 UTC (rev 28083)
@@ -49,8 +49,6 @@
*/
protected function execute($arguments = array(), $options = array())
{
- $this->createContext($this->configuration);
-
$install = new sfSympalInstall($this->configuration, $this->dispatcher,
$this->formatter);
$install->setApplication($arguments['application']);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/task/sfSympalPluginUninstallTask.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/task/sfSympalPluginUninstallTask.class.php
2010-02-17 15:23:55 UTC (rev 28082)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalPluginManagerPlugin/lib/task/sfSympalPluginUninstallTask.class.php
2010-02-17 15:24:43 UTC (rev 28083)
@@ -34,7 +34,6 @@
return 1;
}
- $this->createContext($this->configuration);
$pluginManager =
sfSympalPluginManager::getActionInstance($arguments['name'], 'uninstall',
$this->configuration, $this->formatter);
$pluginManager->uninstall($options['delete']);
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalSearchPlugin/lib/task/sfSympalBuildSearchIndexTask.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalSearchPlugin/lib/task/sfSympalBuildSearchIndexTask.class.php
2010-02-17 15:23:55 UTC (rev 28082)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalSearchPlugin/lib/task/sfSympalBuildSearchIndexTask.class.php
2010-02-17 15:24:43 UTC (rev 28083)
@@ -35,8 +35,6 @@
*/
protected function execute($arguments = array(), $options = array())
{
- $this->createContext($this->configuration);
-
if ($this->configuration instanceof sfApplicationConfiguration &&
!$options['all'])
{
$this->sites = Doctrine_Core::getTable('sfSympalSite')
@@ -54,7 +52,6 @@
if (!$this->configuration instanceof sfApplicationConfiguration ||
$options['all'])
{
$this->configuration = $this->createConfiguration($site->slug,
$options['env']);
- $this->createContext($this->configuration);
}
$this->logSection('sympal', sprintf('Indexing models for site "%s"',
sfConfig::get('sf_app')));
--
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.
