Author: sevein
Date: Mon Aug 13 23:18:25 2012
New Revision: 12096
Log:
Pass sourceCulture when necessary to ensure settings are stored properly, fixes
issue 2141
Modified:
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/pluginsAction.class.php
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/themesAction.class.php
Modified:
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/pluginsAction.class.php
==============================================================================
---
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/pluginsAction.class.php
Mon Aug 13 23:14:35 2012 (r12095)
+++
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/pluginsAction.class.php
Mon Aug 13 23:18:25 2012 (r12096)
@@ -34,7 +34,7 @@
{
$setting = $query[0];
- $this->form->setDefault('enabled', unserialize($setting->__get('value',
array('sourceCulture' => true))));
+ $this->form->setDefault('enabled',
unserialize($setting->getValue(array('sourceCulture' => true))));
}
$configuration = ProjectConfiguration::getActive();
@@ -79,7 +79,7 @@
$setting->name = 'plugins';
}
- $settings = unserialize($setting->__get('value', array('sourceCulture'
=> true)));
+ $settings = unserialize($setting->getValue(array('sourceCulture' =>
true)));
foreach (array_keys($this->plugins) as $item)
{
@@ -96,7 +96,7 @@
}
}
- $setting->__set('value', serialize(array_unique($settings)));
+ $setting->setValue(serialize(array_unique($settings)),
array('sourceCulture' => true));
$setting->save();
$this->redirect(array('module' => 'sfPluginAdminPlugin', 'action' =>
'plugins'));
Modified:
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/themesAction.class.php
==============================================================================
---
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/themesAction.class.php
Mon Aug 13 23:14:35 2012 (r12095)
+++
trunk/plugins/sfPluginAdminPlugin/modules/sfPluginAdminPlugin/actions/themesAction.class.php
Mon Aug 13 23:18:25 2012 (r12096)
@@ -34,7 +34,7 @@
{
$setting = $query[0];
- $this->form->setDefault('enabled', unserialize($setting->__get('value',
array('sourceCulture' => true))));
+ $this->form->setDefault('enabled',
unserialize($setting->getValue(array('sourceCulture' => true))));
}
$configuration = ProjectConfiguration::getActive();
@@ -79,7 +79,7 @@
$setting->name = 'plugins';
}
- $settings = unserialize($setting->__get('value', array('sourceCulture'
=> true)));
+ $settings = unserialize($setting->getValue(array('sourceCulture' =>
true)));
foreach (array_keys($this->plugins) as $item)
{
@@ -96,11 +96,11 @@
}
}
- $setting->__set('value', serialize(array_unique($settings)));
+ $setting->setValue(serialize(array_unique($settings)),
array('sourceCulture' => true));
$setting->save();
// Clear cache
- $cacheClear = new
sfCacheClearTask(sfContext::getInstance()->getEventDispatcher(), new
sfFormatter());
+ $cacheClear = new
sfCacheClearTask(sfContext::getInstance()->getEventDispatcher(), new
sfFormatter());
$cacheClear->run();
$this->redirect(array('module' => 'sfPluginAdminPlugin', 'action' =>
'themes'));
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" 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/qubit-commits?hl=en.
