Author: Jonathan.Wage
Date: 2010-01-17 11:27:05 +0100 (Sun, 17 Jan 2010)
New Revision: 26758
Removed:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with config saving
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-17 10:19:32 UTC (rev 26757)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/form/sfSympalConfigForm.class.php
2010-01-17 10:27:05 UTC (rev 26758)
@@ -103,13 +103,6 @@
file_put_contents($this->_path, sfYaml::dump($array, 4));
- // Clear cache for app.yml
- $cachePath =
sfConfig::get('sf_cache_dir').'/'.sfConfig::get('sf_app').'/'.sfConfig::get('sf_environment').'/config/config_app.yml.php';
- if (file_exists($cachePath))
- {
- unlink($cachePath);
- }
-
chdir(sfConfig::get('sf_root_dir'));
$task = new
sfCacheClearTask(sfApplicationConfiguration::getActive()->getEventDispatcher(),
new sfFormatter());
$task->run(array(), array('type' => 'config'));
@@ -131,7 +124,7 @@
}
return sfToolkit::arrayDeepMerge(
- sfYaml::load(sfConfig::get('sf_config_dir').'/app.yml'),
+ sfYaml::load(sfConfig::get('sf_app_dir').'/config/app.yml'),
$array
);
}
Deleted:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-01-17 10:19:32 UTC (rev 26757)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-01-17 10:27:05 UTC (rev 26758)
@@ -1,16 +0,0 @@
-all:
- sympal_config:
- sfSympalBlogPlugin:
- installed: true
- sfSympalCommentsPlugin:
- installed: true
- sfSympalThemeTestPlugin:
- installed: true
- installed: true
- current_version: 1.0.0-ALPHA1
- upgrade_version_history:
- - 0.7.0__2
- breadcrumbs_separator: ' :: '
- plugin_api:
- username: test
- password: test
--
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.
